Abort sync cycles when download step fails

chrome/browser/sync/test/integration/migration_errors_test.cc

Index: chrome/browser/sync/test/integration/migration_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
index abfca57024fac90034918ee322ec446207f9b69b..72da877c8611cff96d5fbab68aa6f613edf7d830 100644
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -182,10 +182,8 @@ class MigrationTest : public SyncTest {
       AwaitQuiescence();
     }
 
-    // Re-enable notifications if we disabled it.
-    if (do_test_without_notifications) {
-      EnableNotifications();
-    }
+    // TODO(rlarocque): It should be possible to re-enable notifications
+    // here, but doing so makes some windows tests flaky.
   }
 
  private:
@@ -251,6 +249,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, BookmarksPrefsBoth) {
 
 // Two data types with one being nigori.
 
+// See crbug.com/124480.
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
                        DISABLED_PrefsNigoriIndividiaully) {
   RunSingleClientMigrationTest(
@@ -258,8 +257,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
       TRIGGER_NOTIFICATION);
 }
 
-// TODO(rlarocque): Re-enable this test when crbug.com/122033 is fixed.
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_PrefsNigoriBoth) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
   RunSingleClientMigrationTest(
       MakeList(MakeSet(syncable::PREFERENCES, syncable::NIGORI)),
       MODIFY_PREF);
@@ -294,6 +292,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
 
 // All data types plus nigori.
 
+// See crbug.com/124480.
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
                        DISABLED_AllTypesWithNigoriIndividually) {
   ASSERT_TRUE(SetupClients());
@@ -302,9 +301,8 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
   RunSingleClientMigrationTest(migration_list, MODIFY_BOOKMARK);
 }
 
-// TODO(rlarocque): Re-enable this test when crbug.com/122033 is fixed.
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
-                       DISABLED_AllTypesWithNigoriAtOnce) {
+                       AllTypesWithNigoriAtOnce) {
   ASSERT_TRUE(SetupClients());
   syncable::ModelTypeSet all_types = GetPreferredDataTypes();
   all_types.Put(syncable::NIGORI);
@@ -345,15 +343,9 @@ class MigrationTwoClientTest : public MigrationTest {
   DISALLOW_COPY_AND_ASSIGN(MigrationTwoClientTest);
 };
 
-#if defined(OS_MACOSX)
-#define MAYBE_MigratePrefsThenModifyBookmark DISABLED_MigratePrefsThenModifyBookmark
-#else
-#define MAYBE_MigratePrefsThenModifyBookmark MigratePrefsThenModifyBookmark
-#endif
 // Easiest possible test of migration errors: triggers a server
 // migration on one datatype, then modifies some other datatype.
-IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
-                       MAYBE_MigratePrefsThenModifyBookmark) {
+IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigratePrefsThenModifyBookmark) {
   RunTwoClientMigrationTest(MakeList(syncable::PREFERENCES),
                             MODIFY_BOOKMARK);
 }
@@ -378,7 +370,7 @@ IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigrationHellWithoutNigori) {
   RunTwoClientMigrationTest(migration_list, MODIFY_BOOKMARK);
 }
 
-// TODO(rlarocque) Re-enable this test when crbug.com/122033 is fixed.
+// See crbug.com/124480.
 IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
                        DISABLED_MigrationHellWithNigori) {
   ASSERT_TRUE(SetupClients());
@@ -409,7 +401,8 @@ class MigrationReconfigureTest : public MigrationTwoClientTest {
   DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
 };
 
-IN_PROC_BROWSER_TEST_F(MigrationReconfigureTest, DISABLED_SetSyncTabs) {
+IN_PROC_BROWSER_TEST_F(MigrationReconfigureTest,
+                       DISABLED_SetSyncTabs) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;