Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

Issue 2670903002: [Sync] Make EnableDisableSingleClientTest more robust. (Closed)
Patch Set: Updates for Patrick. Created 3 years, 11 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/test/integration/enable_disable_test.cc ('k') | components/sync/base/sync_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
index 4e552de4cffa9a4fee54372652d93496f0bc65b4..97f45645a54a9bc05db265383cc7f7fa1849b5c1 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
@@ -329,6 +329,12 @@ bool ProfileSyncServiceHarness::EnableSyncForDatatype(
return false;
}
+ if (!syncer::UserSelectableTypes().Has(datatype)) {
+ LOG(ERROR) << "Can only enable user selectable types, requested "
+ << syncer::ModelTypeToString(datatype);
+ return false;
+ }
+
syncer::ModelTypeSet synced_datatypes = service()->GetPreferredDataTypes();
if (synced_datatypes.Has(datatype)) {
DVLOG(1) << "EnableSyncForDatatype(): Sync already enabled for datatype "
@@ -362,6 +368,12 @@ bool ProfileSyncServiceHarness::DisableSyncForDatatype(
return false;
}
+ if (!syncer::UserSelectableTypes().Has(datatype)) {
+ LOG(ERROR) << "Can only disable user selectable types, requested "
+ << syncer::ModelTypeToString(datatype);
+ return false;
+ }
+
syncer::ModelTypeSet synced_datatypes = service()->GetPreferredDataTypes();
if (!synced_datatypes.Has(datatype)) {
DVLOG(1) << "DisableSyncForDatatype(): Sync already disabled for datatype "
« no previous file with comments | « chrome/browser/sync/test/integration/enable_disable_test.cc ('k') | components/sync/base/sync_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698