chrome/test/base/testing_pref_service.cc - Issue 8568019: Introduce per-tab preferences service.

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: Single PrefService constructor 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

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..445c2834b2f5bf85e637d151a4c8c30db7127549 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,14 +19,21 @@ TestingPrefServiceBase::TestingPrefServiceBase(

TestingPrefStore* managed_platform_prefs,

TestingPrefStore* user_prefs,

TestingPrefStore* recommended_platform_prefs)

- : PrefService(managed_platform_prefs,

- NULL,

+ : PrefService(new PrefNotifierImpl(),

user_prefs,

- recommended_platform_prefs,

- NULL,

new DefaultPrefStore(),

+ new PrefModelAssociator(),

Mattias Nissler (ping if slow) 2011/11/18 14:57:07 same here: Do we really need a non-null associator

mnaganov (inactive) 2011/11/21 14:52:20 Not sure, but I trust you. Set to NULL.

mnaganov (inactive) 2011/11/21 16:36:39 I have found the reason: ProfileSyncServicePrefere

+ new PrefValueStore(

+ managed_platform_prefs,

+ NULL,

+ PrefService::user_pref_store_.get(),

Mattias Nissler (ping if slow) 2011/11/18 14:57:07 How can this work? The PrefValueStore ctor() run b

mnaganov (inactive) 2011/11/21 14:52:20 Oh, right. Of course, call semantics requires argu

+ recommended_platform_prefs,

+ NULL,

+ PrefService::default_store_.get(),

+ PrefService::pref_sync_associator_.get(),

+ PrefService::pref_notifier_.get()),

false),

managed_platform_prefs_(managed_platform_prefs),

user_prefs_(user_prefs),

« chrome/browser/prefs/pref_service_mock_builder.cc ('K') | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »