Fixing race conidtion

chrome/test/live_sync/two_client_live_preferences_sync_test.cc

Index: chrome/test/live_sync/two_client_live_preferences_sync_test.cc
diff --git a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
index 306bd91b6c953080c68b04cd1988aa2d01d54a77..86be27402758bac0efe6a01a5561d4bbc754b270 100644
--- a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
@@ -434,15 +434,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest,
 }
 
 // TCM ID - 7583816
-// TODO(braffert): This test fails on linux.  See http://crbug.com/85250.
-IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest,
-                       FAILS_kAcceptLanguages) {
+IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, kAcceptLanguages) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  DisableVerifier();
   ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
 
   AppendStringPref(0, prefs::kAcceptLanguages, ",ar");
   AppendStringPref(1, prefs::kAcceptLanguages, ",fr");
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AwaitQuiescence());
   // kAcceptLanguages is not synced on Mac.
 #if !defined(OS_MACOSX)
   ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));