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

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

Issue 9185031: Avoid SYNC_CYCLE_CONTINUATION sync cycles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 8 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
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 dafcbb6a6ea84be9b731de5349413bfb1092d7e1..ed71c255b510d78aa60910dceebf282f53d67183 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -40,11 +40,14 @@ bool DoesTopLevelNodeExist(sync_api::UserShare* user_share,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
ASSERT_TRUE(SetupClients());
- DisableNotifications();
-
// Setup sync with no enabled types.
ASSERT_TRUE(GetClient(0)->SetupSync(syncable::ModelTypeSet()));
+ // TODO(rlarocque, 97780): It should be possible to disable notifications
+ // before calling SetupSync(). We should move this line back to the top
+ // of this function when this is supported.
+ DisableNotifications();
+
const syncable::ModelTypeSet registered_types =
GetClient(0)->service()->GetRegisteredDataTypes();
sync_api::UserShare* user_share = GetClient(0)->service()->GetUserShare();
@@ -73,11 +76,14 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
ASSERT_TRUE(SetupClients());
- DisableNotifications();
-
// Setup sync with no disabled types.
ASSERT_TRUE(GetClient(0)->SetupSync());
+ // TODO(rlarocque, 97780): It should be possible to disable notifications
+ // before calling SetupSync(). We should move this line back to the top
+ // of this function when this is supported.
+ DisableNotifications();
+
const syncable::ModelTypeSet registered_types =
GetClient(0)->service()->GetRegisteredDataTypes();
« no previous file with comments | « chrome/browser/sync/sessions/test_util.cc ('k') | chrome/browser/sync/test/integration/migration_errors_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698