Disable flaky TwoClientUssSyncTest.ConflictResolution on Linux

TBR=zea@chromium.org

Bug: 785967
Change-Id: I7f5088c10e16ba77417d801de216f68c6a65322a
Reviewed-on: https://chromium-review.googlesource.com/774884Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517104}

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

@@ -5,6 +5,7 @@
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ -299,7 +300,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, DisableEnable) {
   ASSERT_EQ(1U, model1->db().metadata_count());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, ConflictResolution) {
+// Flaky on Linux. See https://crbug.com/785967.
+#if defined(OS_LINUX)
+#define MAYBE_ConflictResolution DISABLED_ConflictResolution
+#else
+#define MAYBE_ConflictResolution ConflictResolution
+#endif
+IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, MAYBE_ConflictResolution) {
   ASSERT_TRUE(SetupSync());
   TestModelTypeSyncBridge* model0 = GetModelTypeSyncBridge(0);
   TestModelTypeSyncBridge* model1 = GetModelTypeSyncBridge(1);