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

Unified Diff: chrome/browser/extensions/extension_prefs_unittest.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/extension_prefs_unittest.cc

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

index c2bfc8655a3181414ec718bcd61b6c1f8c25c31b..4cf37f47389c762b8539088ac0004fa053bf1555 100644

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

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

@@ -15,6 +15,8 @@

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

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

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

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

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

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

#include "chrome/common/chrome_paths.h"

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

@@ -820,14 +822,16 @@ ExtensionPrefsPrepopulatedTest::ExtensionPrefsPrepopulatedTest()

ExtensionPrefsPrepopulatedTest::~ExtensionPrefsPrepopulatedTest() {}

void ExtensionPrefsPrepopulatedTest::RegisterPreferences() {

- prefs()->pref_service()->RegisterStringPref(

- kPref1, kDefaultPref1, PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs()->pref_service()->RegisterStringPref(

- kPref2, kDefaultPref2, PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs()->pref_service()->RegisterStringPref(

- kPref3, kDefaultPref3, PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs()->pref_service()->RegisterStringPref(

- kPref4, kDefaultPref4, PrefServiceSyncable::UNSYNCABLE_PREF);

+ PrefRegistrySyncable* registry = static_cast<PrefRegistrySyncable*>(

+ prefs()->pref_service()->DeprecatedGetPrefRegistry());

Mattias Nissler (ping if slow) 2013/02/06 17:53:33 This is an interesting case. One option could be t

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

+ registry->RegisterStringPref(

+ kPref1, kDefaultPref1, PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterStringPref(

+ kPref2, kDefaultPref2, PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterStringPref(

+ kPref3, kDefaultPref3, PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterStringPref(

+ kPref4, kDefaultPref4, PrefRegistrySyncable::UNSYNCABLE_PREF);

}

void ExtensionPrefsPrepopulatedTest::InstallExtControlledPref(