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/prefs/json_pref_store_unittest.cc | |
| 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/prefs/json_pref_store_unittest.cc')
| -rw-r--r-- | base/prefs/json_pref_store_unittest.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc index 175ef2c5..1368b3f 100644 --- a/base/prefs/json_pref_store_unittest.cc +++ b/base/prefs/json_pref_store_unittest.cc @@ -42,13 +42,8 @@ class JsonPrefStoreTest : public testing::Test { virtual void SetUp() OVERRIDE { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir_)); - data_dir_ = data_dir_.AppendASCII("base"); + ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir_)); data_dir_ = data_dir_.AppendASCII("prefs"); - data_dir_ = data_dir_.AppendASCII("test"); - data_dir_ = data_dir_.AppendASCII("data"); - data_dir_ = data_dir_.AppendASCII("pref_service"); - LOG(WARNING) << data_dir_.value().c_str(); ASSERT_TRUE(file_util::PathExists(data_dir_)); } |