Fixing race conidtion

chrome/test/live_sync/two_client_live_preferences_sync_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/values.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/live_sync/live_preferences_sync_test.h"
 
@@ skipping 416 matching lines @@
                        kExtensionsUIDeveloperMode) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(prefs::kExtensionsUIDeveloperMode));
 
   ChangeBooleanPref(0, prefs::kExtensionsUIDeveloperMode);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kExtensionsUIDeveloperMode));
 }
 
 // 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));
 #else
   ASSERT_FALSE(StringPrefMatches(prefs::kAcceptLanguages));
 #endif  // OS_MACOSX
 
   ChangeStringPref(0, prefs::kAcceptLanguages, "en-US");
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 #if !defined(OS_MACOSX)
@@ skipping 60 matching lines @@
 
   ChangeBooleanPref(0, prefs::kEnableScreenLock);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableScreenLock));
 
   ChangeBooleanPref(1, prefs::kEnableScreenLock);
   ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableScreenLock));
 }
 #endif  // OS_CHROMEOS