Disable flaky test SyncErrorTest.ClientDataObsoleteTest.

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

Index: chrome/browser/sync/test/integration/sync_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index cce9867834393cce845f63e44b49be04ce9df894..961af281193420701d63fee9b6c1e9d743fbcd9c 100644
--- a/chrome/browser/sync/test/integration/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
@@ -202,7 +202,13 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorUsingActionableErrorTest) {
 
 // Tests that on receiving CLIENT_DATA_OBSOLETE sync engine gets restarted and
 // initialized with different cache_guld.
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, ClientDataObsoleteTest) {
+// Flaky on Windows and Linux. See crbug.com/683216
+#if defined(OS_WIN) || defined(OS_LINUX)
+#define MAYBE_ClientDataObsoleteTest DISABLED_ClientDataObsoleteTest
+#else
+#define MAYBE_ClientDataObsoleteTest ClientDataObsoleteTest
+#endif
+IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_ClientDataObsoleteTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   const BookmarkNode* node1 = AddFolder(0, 0, "title1");