chrome/browser/sync/invalidations/invalidator_storage.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and 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/invalidations/invalidator_storage.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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

« no previous file with comments | « chrome/browser/sync/invalidations/invalidator_storage.h ('k') | chrome/browser/sync/invalidations/invalidator_storage_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/invalidations/invalidator_storage.cc

diff --git a/chrome/browser/sync/invalidations/invalidator_storage.cc b/chrome/browser/sync/invalidations/invalidator_storage.cc

index ebd6dbc74f447a0b4a9d8fa3387a543b182aa248..b17ba509c05dab8b56cdb69c04799b4ee0e2fc6c 100644

--- a/chrome/browser/sync/invalidations/invalidator_storage.cc

+++ b/chrome/browser/sync/invalidations/invalidator_storage.cc

@@ -93,17 +93,17 @@ DictionaryValue* ObjectIdAndStateToValue(

} // namespace

-InvalidatorStorage::InvalidatorStorage(PrefService* pref_service)

+InvalidatorStorage::InvalidatorStorage(PrefServiceSyncable* pref_service)

: pref_service_(pref_service) {

// TODO(tim): Create a Mock instead of maintaining the if(!pref_service_) case

// throughout this file. This is a problem now due to lack of injection at

// ProfileSyncService. Bug 130176.

if (pref_service_) {

pref_service_->RegisterListPref(prefs::kInvalidatorMaxInvalidationVersions,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

pref_service_->RegisterStringPref(prefs::kInvalidatorInvalidationState,

std::string(),

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

MigrateMaxInvalidationVersionsPref();

}

@@ -195,7 +195,7 @@ void InvalidatorStorage::SerializeToList(

// Legacy migration code.

void InvalidatorStorage::MigrateMaxInvalidationVersionsPref() {

pref_service_->RegisterDictionaryPref(prefs::kSyncMaxInvalidationVersions,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

const base::DictionaryValue* max_versions_dict =

pref_service_->GetDictionary(prefs::kSyncMaxInvalidationVersions);

CHECK(max_versions_dict);