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
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index cffab35..1f10a33 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -1531,10 +1531,8 @@
TEST_F(ReadOnlyFileUtilTest, ContentsEqual) {
FilePath data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
- data_dir = data_dir.Append(FILE_PATH_LITERAL("base"))
- .Append(FILE_PATH_LITERAL("data"))
- .Append(FILE_PATH_LITERAL("file_util_unittest"));
+ ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir));
+ data_dir = data_dir.AppendASCII("file_util");
ASSERT_TRUE(file_util::PathExists(data_dir));
FilePath original_file =
@@ -1580,10 +1578,8 @@
TEST_F(ReadOnlyFileUtilTest, TextContentsEqual) {
FilePath data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
- data_dir = data_dir.Append(FILE_PATH_LITERAL("base"))
- .Append(FILE_PATH_LITERAL("data"))
- .Append(FILE_PATH_LITERAL("file_util_unittest"));
+ ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir));
+ data_dir = data_dir.AppendASCII("file_util");
ASSERT_TRUE(file_util::PathExists(data_dir));
FilePath original_file =