Fix the false-positive detection of commit errors

chrome/browser/sync/test/integration/two_client_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/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/common/pref_names.h"
@@ skipping 102 matching lines @@
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncPreferences));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kPasswordManagerEnabled));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 
   GetClient(1)->DisableSyncForAllDatatypes();
   ChangeBooleanPref(0, prefs::kPasswordManagerEnabled);
-  ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Changed a preference."));
+  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Changed a preference."));
   ASSERT_FALSE(BooleanPrefMatches(
       prefs::kPasswordManagerEnabled));
 
   ChangeBooleanPref(1, prefs::kShowHomeButton);
   ASSERT_FALSE(BooleanPrefMatches(prefs::kShowHomeButton));
 
   GetClient(1)->EnableSyncForAllDatatypes();
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kPasswordManagerEnabled));
@@ skipping 547 matching lines @@
   ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
   ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }