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 1034da29d10f9122840bd64b6d8487e5a427886e..399787ea79d1dd8e8213e2e449b1ea9eca004947 100644 |
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc |
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc |
@@ -351,9 +351,17 @@ IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, |
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 |
+ |
// 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, MigrationHellWithoutNigori) { |
+IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, |
+ MAYBE_MigrationHellWithoutNigori) { |
ASSERT_TRUE(SetupClients()); |
MigrationList migration_list = GetPreferredDataTypesList(); |
// Let the first nudge be a datatype that's neither prefs nor |