diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-07 16:27:46 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-07 16:27:46 +0000 |
| commit | fd1d067bf96418e78c89cadc263f13e23ecab08f (patch) | |
| tree | 5c874b675e108fd3336782eea6d9af7ac2a2b821 /base/json | |
| parent | 9ec0f9c97357dd5b4dd9deae252f8d3633ad38a9 (diff) | |
| download | chromium_src-fd1d067bf96418e78c89cadc263f13e23ecab08f.zip chromium_src-fd1d067bf96418e78c89cadc263f13e23ecab08f.tar.gz chromium_src-fd1d067bf96418e78c89cadc263f13e23ecab08f.tar.bz2 | |
base: Consolidate all test data directories under base/test/data.
This is the follow up patch I promised in r191077 -
https://chromiumcodereview.appspot.com/12481028
TEST=base_unittests
R=darin@chromium.org,bulach@chromium.org
Review URL: https://codereview.chromium.org/13376002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
| -rw-r--r-- | base/json/json_reader_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc index 4cf1d37..ab38b04 100644 --- a/base/json/json_reader_unittest.cc +++ b/base/json/json_reader_unittest.cc @@ -542,10 +542,9 @@ TEST(JSONReaderTest, Reading) { TEST(JSONReaderTest, ReadFromFile) { FilePath path; - ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path)); - path = path.Append(FILE_PATH_LITERAL("base")) - .Append(FILE_PATH_LITERAL("data")) - .Append(FILE_PATH_LITERAL("json")); + ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &path)); + path = path.AppendASCII("json"); + ASSERT_TRUE(file_util::PathExists(path)); std::string input; ASSERT_TRUE(file_util::ReadFileToString( |