Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf

1 files changed, 2 insertions, 3 deletions

diff --git a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
index 735f65d367..0377043162 100644
--- a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
@@ -9,7 +9,7 @@
 #include "chrome/common/pref_names.h"
 
 using preferences_helper::ChangeListPref;
-using preferences_helper::ListPrefMatches;
+using preferences_helper::AwaitListPrefMatches;
 
 class MultipleClientPreferencesSyncTest : public SyncTest {
  public:
@@ -31,6 +31,5 @@ IN_PROC_BROWSER_TEST_F(MultipleClientPreferencesSyncTest, Sanity) {
     ChangeListPref(i, prefs::kURLsToRestoreOnStartup, urls);
   }
 
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(ListPrefMatches(prefs::kURLsToRestoreOnStartup));
+  ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup));
 }