Index: chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc |
index e47084ddbc513ee7bba6e3c0598cb87148af3c85..de4d449e3181fd751b549b61c81f04f47bbf60cd 100644 |
--- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc |
+++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc |
@@ -183,7 +183,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Delete) { |
} |
// TCM ID - 7573511 |
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DeleteAll) { |
+// Flaky on Mac and Windows: http://crbug.com/111399 |
+#if defined(OS_WIN) || defined(OS_MACOSX) |
+#define MAYBE_DeleteAll DISABLED_DeleteAll |
+#else |
+#define MAYBE_DeleteAll DeleteAll |
+#endif |
+IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, MAYBE_DeleteAll) { |
ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier()); |