Disable flaky...

Disable flaky TwoClient(Passwords|CustomPassphrase)SyncTest.SetPassphraseAndThenSetupSync on OS_CHROMEOS

R=treib@chromium.org

Bug: 956012
Change-Id: I138bc34165986d185a530e11accd0f60a22b5559
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1582040Reviewed-by: Marc Treib <treib@chromium.org>
Auto-Submit: Gabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653566}

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

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/encryption_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ -90,8 +91,16 @@ IN_PROC_BROWSER_TEST_F(TwoClientCustomPassphraseSyncTest, ClientsCanSyncData) {
   EXPECT_TRUE(WaitForBookmarksToMatchVerifier());
 }
 
+#if defined(OS_CHROMEOS)
+// https://crbug.com/956012
+#define MAYBE_SetPassphraseAndThenSetupSync \
+  DISABLED_SetPassphraseAndThenSetupSync
+#else
+#define MAYBE_SetPassphraseAndThenSetupSync SetPassphraseAndThenSetupSync
+#endif
+
 IN_PROC_BROWSER_TEST_F(TwoClientCustomPassphraseSyncTest,
-                       SetPassphraseAndThenSetupSync) {
+                       MAYBE_SetPassphraseAndThenSetupSync) {
   ASSERT_TRUE(SetupClients());
   ASSERT_TRUE(GetClient(kEncryptingClientId)->SetupSync());
 

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

@@ -287,8 +287,12 @@ IN_PROC_BROWSER_TEST_P(TwoClientPasswordsSyncTest, MAYBE_Delete) {
   ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
 }
 
-// Flaky on TSAN: crbug.com/915219
 #if defined(THREAD_SANITIZER)
+// Flaky on TSAN: crbug.com/915219
+#define MAYBE_SetPassphraseAndThenSetupSync \
+  DISABLED_SetPassphraseAndThenSetupSync
+#elif defined(OS_CHROMEOS)
+// https://crbug.com/956012
 #define MAYBE_SetPassphraseAndThenSetupSync \
   DISABLED_SetPassphraseAndThenSetupSync
 #else