Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4769)

Unified Diff: base/prefs/json_pref_store_unittest.cc

Issue 11411159: base/prefs: Break the dependency in chrome_paths.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add path to fix android Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/prefs/DEPS ('k') | base/prefs/test/data/pref_service/invalid.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5eac326bf002ee3132b265aba0b99ceeb3a4134b..6b89f9aaac98f517082eb6a63e38d7fb8e4d62e4 100644
--- a/base/prefs/json_pref_store_unittest.cc
+++ b/base/prefs/json_pref_store_unittest.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/prefs/json_pref_store.h"
+
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/prefs/json_pref_store.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/common/chrome_paths.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -40,8 +40,13 @@ class JsonPrefStoreTest : public testing::Test {
virtual void SetUp() OVERRIDE {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_));
+ ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir_));
+ data_dir_ = data_dir_.AppendASCII("base");
+ 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();
ASSERT_TRUE(file_util::PathExists(data_dir_));
}
« no previous file with comments | « base/prefs/DEPS ('k') | base/prefs/test/data/pref_service/invalid.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698