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

Unified Diff: chrome/browser/prefs/pref_service_mock_builder.cc

Issue 8568019: Introduce per-tab preferences service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed ProfileSyncServicePreferenceTest tests Created 9 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
Index: chrome/browser/prefs/pref_service_mock_builder.cc
diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
index c4916cbc97e265b9152884a002e49c72c1b802bf..a206e62a6cd1d3e8b3fef5a424c61309d9656f9f 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.cc
+++ b/chrome/browser/prefs/pref_service_mock_builder.cc
@@ -7,6 +7,8 @@
#include "chrome/browser/policy/configuration_policy_pref_store.h"
#include "chrome/browser/prefs/command_line_pref_store.h"
#include "chrome/browser/prefs/default_pref_store.h"
+#include "chrome/browser/prefs/pref_notifier_impl.h"
+#include "chrome/browser/prefs/pref_value_store.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/testing_pref_store.h"
#include "chrome/common/json_pref_store.h"
@@ -109,16 +111,26 @@ PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) {
}
PrefService* PrefServiceMockBuilder::Create() {
+ DefaultPrefStore* default_pref_store = new DefaultPrefStore();
+ PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
PrefService* pref_service =
- new PrefService(managed_platform_prefs_.get(),
- managed_cloud_prefs_.get(),
- extension_prefs_.get(),
- command_line_prefs_.get(),
- user_prefs_.get(),
- recommended_platform_prefs_.get(),
- recommended_cloud_prefs_.get(),
- new DefaultPrefStore(),
- false);
+ new PrefService(
+ pref_notifier,
+ new PrefValueStore(
+ managed_platform_prefs_.get(),
+ managed_cloud_prefs_.get(),
+ extension_prefs_.get(),
+ command_line_prefs_.get(),
+ user_prefs_.get(),
+ recommended_platform_prefs_.get(),
+ recommended_cloud_prefs_.get(),
+ default_pref_store,
+ NULL,
+ pref_notifier),
+ user_prefs_.get(),
+ default_pref_store,
+ NULL,
+ false);
managed_platform_prefs_ = NULL;
managed_cloud_prefs_ = NULL;
extension_prefs_ = NULL;

Powered by Google App Engine
This is Rietveld 408576698