diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /courgette/base_test_unittest.cc | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'courgette/base_test_unittest.cc')
| -rw-r--r-- | courgette/base_test_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/courgette/base_test_unittest.cc b/courgette/base_test_unittest.cc index f85fd35e48..a0e7d05a95 100644 --- a/courgette/base_test_unittest.cc +++ b/courgette/base_test_unittest.cc @@ -17,7 +17,7 @@ void BaseTest::TearDown() { // Reads a test file into a string. std::string BaseTest::FileContents(const char* file_name) const { - FilePath file_path = test_dir_; + base::FilePath file_path = test_dir_; file_path = file_path.AppendASCII(file_name); std::string file_bytes; |