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

Unified Diff: chrome/test/base/testing_pref_service.cc

Issue 8568019: Introduce per-tab preferences service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/test/base/testing_pref_service.cc
diff --git a/chrome/test/base/testing_pref_service.cc b/chrome/test/base/testing_pref_service.cc
index 962dddb4b9d778c6b0e4dca8fa39a0d5abcaa430..d5ba5c4bb073682f39473387c84b675dd2afcfdb 100644
--- a/chrome/test/base/testing_pref_service.cc
+++ b/chrome/test/base/testing_pref_service.cc
@@ -8,7 +8,8 @@
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/command_line_pref_store.h"
#include "chrome/browser/prefs/default_pref_store.h"
-#include "chrome/browser/prefs/pref_notifier.h"
+#include "chrome/browser/prefs/pref_model_associator.h"
+#include "chrome/browser/prefs/pref_notifier_impl.h"
#include "chrome/browser/prefs/pref_value_store.h"
#include "chrome/browser/prefs/testing_pref_store.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -18,15 +19,18 @@ TestingPrefServiceBase::TestingPrefServiceBase(
TestingPrefStore* managed_platform_prefs,
TestingPrefStore* user_prefs,
TestingPrefStore* recommended_platform_prefs)
- : PrefService(managed_platform_prefs,
- NULL,
- NULL,
- NULL,
- user_prefs,
- recommended_platform_prefs,
- NULL,
- new DefaultPrefStore(),
- false),
+ : PrefService(
+ new PrefValueStore(managed_platform_prefs,
+ NULL,
+ NULL,
+ NULL,
+ user_prefs,
+ recommended_platform_prefs,
+ NULL,
+ new DefaultPrefStore(),
+ new PrefModelAssociator(),
+ new PrefNotifierImpl()),
+ false),
managed_platform_prefs_(managed_platform_prefs),
user_prefs_(user_prefs),
recommended_platform_prefs_(recommended_platform_prefs) {

Powered by Google App Engine
This is Rietveld 408576698