chrome/browser/sync/test/integration/enable_disable_test.cc - Issue 1363803002: Revert of [Sync] Move data type logic from PSSA to PSS.

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/test/integration/enable_disable_test.cc

Issue 1363803002: Revert of [Sync] Move data type logic from PSSA to PSS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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

« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.cc ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/enable_disable_test.cc

diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc

index a3901d942805ed014119960f2940a898c0c2f200..433a8be0b97e4bf12bab8bbfa3a3721c54649f0d 100644

--- a/chrome/browser/sync/test/integration/enable_disable_test.cc

+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc

@@ -44,15 +44,12 @@

// Setup sync with no enabled types.

ASSERT_TRUE(GetClient(0)->SetupSync(syncer::ModelTypeSet()));

+ const syncer::ModelTypeSet registered_types =

+ GetSyncService(0)->GetRegisteredDataTypes();

syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();

const sync_driver::DataTypeStatusTable& data_type_status_table =

GetSyncService(0)->data_type_status_table();

- const syncer::ModelTypeSet registered_types =

- GetSyncService(0)->GetRegisteredDataTypes();

- const syncer::ModelTypeSet registered_user_types =

- Intersection(registered_types, syncer::UserSelectableTypes());

- for (syncer::ModelTypeSet::Iterator it = registered_user_types.First();

+ for (syncer::ModelTypeSet::Iterator it = registered_types.First();

it.Good(); it.Inc()) {

ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));