chrome/browser/sync/profile_sync_service_preference_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/sync/profile_sync_service_preference_unittest.cc

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

Patch Set: Merge to head again; base::File changes conflicted. 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/sync/profile_sync_service_preference_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc

index fc9969ed2b4eb2ad07484dca21f41ec6a76e066f..b8ea6c5cbf656387d3640065830d0249bf0b0199 100644

--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc

+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc

@@ -14,6 +14,7 @@

#include "base/stl_util.h"

#include "base/string_piece.h"

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

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

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

#include "chrome/browser/signin/signin_manager.h"

#include "chrome/browser/signin/signin_manager_factory.h"

@@ -123,9 +124,10 @@ class ProfileSyncServicePreferenceTest

profile_->CreateRequestContext();

prefs_ = profile_->GetTestingPrefService();

- prefs_->RegisterStringPref(not_synced_preference_name_.c_str(),

- not_synced_preference_default_value_,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ prefs_->registry()->RegisterStringPref(

+ not_synced_preference_name_.c_str(),

+ not_synced_preference_default_value_,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

virtual void TearDown() {

« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/sync_prefs.h » ('j') | no next file with comments »