Disable MigrationHellWithoutNigori and MigrationHellWithNigori

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(akalin): Rename this file to migration_test.cc.
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
@@ skipping 333 matching lines @@
 // Triggers a server migration on two datatypes, then makes a local
 // modification to one of them.
 // Flaky. crbug.com/100382.
 IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
                        FLAKY_MigratePrefsAndBookmarksThenModifyBookmark) {
   RunTwoClientMigrationTest(
       MakeList(syncable::PREFERENCES, syncable::BOOKMARKS),
       MODIFY_BOOKMARK);
 }
 
-// Flaky on Mac 10.6 Sync bot: http://crbug.com/107205.
-#if defined(OS_MACOSX)
-#define MAYBE_MigrationHellWithoutNigori FLAKY_MigrationHellWithoutNigori
-#else
-#define MAYBE_MigrationHellWithoutNigori MigrationHellWithoutNigori
-#endif
-
+// Flaky on Mac 10.6 Sync bot and crashes on Win7 sync bot:
+// http://crbug.com/107205.
 // Migrate every datatype in sequence; the catch being that the server
 // will only tell the client about the migrations one at a time.
 IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
-                       MAYBE_MigrationHellWithoutNigori) {
+                       DISABLED_MigrationHellWithoutNigori) {
   ASSERT_TRUE(SetupClients());
   MigrationList migration_list = GetPreferredDataTypesList();
   // Let the first nudge be a datatype that's neither prefs nor
   // bookmarks.
   migration_list.push_front(MakeSet(syncable::THEMES));
   RunTwoClientMigrationTest(migration_list, MODIFY_BOOKMARK);
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigrationHellWithNigori) {
+// Flaky on Mac 10.6 Sync bot and crashes on Win7 sync bot:
+// http://crbug.com/107205.
+IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
+                       DISABLED_MigrationHellWithNigori) {
   ASSERT_TRUE(SetupClients());
   MigrationList migration_list = GetPreferredDataTypesList();
   // Let the first nudge be a datatype that's neither prefs nor
   // bookmarks.
   migration_list.push_front(MakeSet(syncable::THEMES));
   // Pop off one so that we don't migrate all data types; the syncer
   // freaks out if we do that (see http://crbug.com/94882).
   ASSERT_GE(migration_list.size(), 2u);
   ASSERT_FALSE(migration_list.back().Equals(MakeSet(syncable::NIGORI)));
   migration_list.back() = MakeSet(syncable::NIGORI);
@@ skipping 65 matching lines @@
 
   // Phase 5: Verify that preferences can still be synchronized.
   VerifyPrefSync();
 
   // Phase 6: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRunning(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }
 
 }  // namespace