chrome/browser/sync/sync_prefs_unittest.cc - Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

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/sync_prefs_unittest.cc

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Merge to TOT and fixed additional conflicts from rsimha. Created 9 years, 1 month 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

Index: chrome/browser/sync/sync_prefs_unittest.cc

===================================================================

--- chrome/browser/sync/sync_prefs_unittest.cc (revision 109292)

+++ chrome/browser/sync/sync_prefs_unittest.cc (working copy)

@@ -41,6 +41,7 @@

syncable::ModelTypeSet GetUserVisibleTypes() {

syncable::ModelTypeSet user_visible_types(GetNonPassiveTypes());

user_visible_types.erase(syncable::AUTOFILL_PROFILE);

+ user_visible_types.erase(syncable::SEARCH_ENGINES);

user_visible_types.erase(syncable::APP_NOTIFICATIONS);

return user_visible_types;

}

@@ -110,6 +111,9 @@

if (*it == syncable::AUTOFILL) {

expected_preferred_types.insert(syncable::AUTOFILL_PROFILE);

}

+ if (*it == syncable::PREFERENCES) {

+ expected_preferred_types.insert(syncable::SEARCH_ENGINES);

+ }

if (*it == syncable::APPS) {

expected_preferred_types.insert(syncable::APP_NOTIFICATIONS);

}

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