components/syncable_prefs/pref_model_associator.h - Issue 1302303002: Remove year+ old migration support of "session.urls_to_restore_on_startup".

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: components/syncable_prefs/pref_model_associator.h

Issue 1302303002: Remove year+ old migration support of "session.urls_to_restore_on_startup". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_service_syncable_unittest

Patch Set: Address comments Created 5 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 | « components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc ('k') | components/syncable_prefs/pref_model_associator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/syncable_prefs/pref_model_associator.h

diff --git a/components/syncable_prefs/pref_model_associator.h b/components/syncable_prefs/pref_model_associator.h

index 37faa43be3fd0db5da676c3948b1712be6af9884..aa33c67d72c60d1fbba69097c93a8f1fef12133a 100644

--- a/components/syncable_prefs/pref_model_associator.h

+++ b/components/syncable_prefs/pref_model_associator.h

@@ -129,15 +129,12 @@ class PrefModelAssociator

// with ours and append a new UPDATE SyncChange to |sync_changes|. If

// sync_pref is not set, we append an ADD SyncChange to |sync_changes| with

// the current preference data.

- // |migrated_preference_list| points to a vector that may be updated with a

- // string containing the old name of the preference described by |pref_name|.

// Note: We do not modify the sync data for preferences that are either

// controlled by policy (are not user modifiable) or have their default value

// (are not user controlled).

void InitPrefAndAssociate(const syncer::SyncData& sync_pref,

const std::string& pref_name,

- syncer::SyncChangeList* sync_changes,

- SyncDataMap* migrated_preference_list);

+ syncer::SyncChangeList* sync_changes);

static base::Value* MergeListValues(

const base::Value& from_value, const base::Value& to_value);