chrome/browser/extensions/test_extension_prefs.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Unified Diff: chrome/browser/extensions/test_extension_prefs.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 years, 10 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: chrome/browser/extensions/test_extension_prefs.cc

diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc

index a261c0ec479101251467079f0e4f13e7111e191d..4407614db6a5a66ee62e43605b8ff8cf14eef9cd 100644

--- a/chrome/browser/extensions/test_extension_prefs.cc

+++ b/chrome/browser/extensions/test_extension_prefs.cc

@@ -18,8 +18,9 @@

#include "chrome/browser/extensions/extension_pref_store.h"

#include "chrome/browser/extensions/extension_pref_value_map.h"

#include "chrome/browser/extensions/extension_prefs.h"

-#include "chrome/browser/prefs/pref_service.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/prefs/pref_service_mock_builder.h"

+#include "chrome/browser/prefs/pref_service_syncable.h"

#include "chrome/browser/prefs/pref_value_store.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_manifest_constants.h"

@@ -93,8 +94,9 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {

builder.WithUserFilePrefs(preferences_file_, task_runner_);

builder.WithExtensionPrefs(

new ExtensionPrefStore(extension_pref_value_map_.get(), false));

- pref_service_.reset(builder.CreateSyncable());

- ExtensionPrefs::RegisterUserPrefs(pref_service_.get());

+ scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);

Mattias Nissler (ping if slow) 2013/02/06 17:53:33 As mentioned elsewhere, it would probably be nice

Jói 2013/02/07 14:52:32 Done.

+ pref_service_.reset(builder.CreateSyncable(registry));

+ ExtensionPrefs::RegisterUserPrefs(registry);

Mattias Nissler (ping if slow) 2013/02/06 17:53:33 For good measure, can we swap lines 98 and 99?

Jói 2013/02/07 14:52:32 Done.

prefs_ = ExtensionPrefs::Create(

pref_service_.get(),