Sync: disable 2 flaky migration tests

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

Index: chrome/browser/sync/test/integration/migration_test.cc
diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc
index 4d7e1aa8a1c53425f692760757aa693f61c86cd2..55fbf3e64398fb90d33a463d2534c8634f625cda 100644
--- a/chrome/browser/sync/test/integration/migration_test.cc
+++ b/chrome/browser/sync/test/integration/migration_test.cc
@@ -287,27 +287,16 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
 }
 
 // The whole shebang -- all data types.
-#if defined(OS_WIN) || defined(OS_MACOSX)
 // http://crbug.com/403778
-#define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually
-#else
-#define MAYBE_AllTypesIndividually AllTypesIndividually
-#endif
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
+                       DISABLED_AllTypesIndividually) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
 }
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
 // http://crbug.com/403778
-#define MAYBE_AllTypesIndividuallyTriggerNotification \
-    DISABLED_AllTypesIndividuallyTriggerNotification
-#else
-#define MAYBE_AllTypesIndividuallyTriggerNotification \
-    AllTypesIndividuallyTriggerNotification
-#endif
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
-                       MAYBE_AllTypesIndividuallyTriggerNotification) {
+                       DISABLED_AllTypesIndividuallyTriggerNotification) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(GetPreferredDataTypesList(),
                                TRIGGER_NOTIFICATION);