base/prefs/json_pref_store_unittest.cc - Issue 13376002: base: Consolidate all test data directories under base/test/data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/prefs/json_pref_store_unittest.cc

Issue 13376002: base: Consolidate all test data directories under base/test/data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase2 Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/prefs/json_pref_store_unittest.cc

diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc

index 175ef2c53b9b45c0a88f30c95b793887982108bd..1368b3f3a393e518c37716ad39ddbe0b5852f6dd 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_));

}

« no previous file with comments | « base/json/json_reader_unittest.cc ('k') | base/prefs/test/data/pref_service/invalid.json » ('j') | no next file with comments »