chrome/browser/prefs/pref_service_unittest.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/pref_service_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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/prefs/pref_service_syncable.cc ('K') | « chrome/browser/prefs/pref_service_syncable_builder.cc ('k') | chrome/browser/prefs/proxy_policy_unittest.cc » ('j') | chrome/browser/profiles/gaia_info_update_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_service_unittest.cc

diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc

index f62cb6bb7616c444656abe8fd75e8f3ce7f4aaab..48b7f32774ec8c09f6e8e5c526f6a85c09cba16a 100644

--- a/chrome/browser/prefs/pref_service_unittest.cc

+++ b/chrome/browser/prefs/pref_service_unittest.cc

@@ -20,6 +20,7 @@

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

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

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

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

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

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

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

@@ -322,25 +323,26 @@ TEST_F(PrefServiceUserFilePrefsTest, PreserveEmptyValue) {

PrefServiceMockBuilder builder;

builder.WithUserFilePrefs(pref_file, message_loop_.message_loop_proxy());

- scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable());

+ scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);

+ scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry));

// Register testing prefs.

- prefs->RegisterListPref("list",

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterDictionaryPref("dict",

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ registry->RegisterListPref("list",

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterDictionaryPref("dict",

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

base::ListValue* non_empty_list = new base::ListValue;

non_empty_list->Append(base::Value::CreateStringValue("test"));

- prefs->RegisterListPref("list_needs_empty_value",

- non_empty_list,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ registry->RegisterListPref("list_needs_empty_value",

+ non_empty_list,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

base::DictionaryValue* non_empty_dict = new base::DictionaryValue;

non_empty_dict->SetString("dummy", "whatever");

- prefs->RegisterDictionaryPref("dict_needs_empty_value",

- non_empty_dict,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ registry->RegisterDictionaryPref("dict_needs_empty_value",

+ non_empty_dict,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

// Set all testing prefs to empty.

ClearListValue(prefs.get(), "list");