commit d05540df72b20a8a593b0893bb6c8ae6060367da
author tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Apr 08 01:27:46 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 14:21:56 2020 +0900
tree 54a541d2e1fe0dd5e3bf7a9f52d7c77108ab2b46
parent 5667e2660bfde6f31dfc06d49bb687ff51c98c4c

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


CrOS-Libchrome-Original-Commit: fd1d067bf96418e78c89cadc263f13e23ecab08f

base/json/json_reader_unittest.cc

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, 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(