Fixing broken Integration tests.

chrome/test/live_sync/two_client_live_autofill_sync_test.cc

 // Copyright (c) 2010 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 "chrome/test/live_sync/live_autofill_sync_test.h"
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, Client1HasData) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutofillKeys keys;
   keys.insert(AutofillKey("name0", "value0"));
   keys.insert(AutofillKey("name0", "value1"));
   keys.insert(AutofillKey("name1", "value2"));
   keys.insert(AutofillKey(WideToUTF16(L"Sigur R\u00F3s"),
                           WideToUTF16(L"\u00C1g\u00E6tis byrjun")));
   AddFormFieldsToWebData(GetWebDataService(0), keys);
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
 
   AutofillKeys wd1_keys;
   GetAllAutofillKeys(GetWebDataService(1), &wd1_keys);
   EXPECT_EQ(keys, wd1_keys);
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, BothHaveData) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutofillKeys keys1;
   keys1.insert(AutofillKey("name0", "value0"));
   keys1.insert(AutofillKey("name0", "value1"));
   keys1.insert(AutofillKey("name1", "value2"));
   AddFormFieldsToWebData(GetWebDataService(0), keys1);
 
   AutofillKeys keys2;
   keys2.insert(AutofillKey("name0", "value1"));
   keys2.insert(AutofillKey("name1", "value2"));
   keys2.insert(AutofillKey("name2", "value3"));
   keys2.insert(AutofillKey("name3", "value3"));
   AddFormFieldsToWebData(GetWebDataService(1), keys2);
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  // Wait for client1 to get the new keys from client2.
-  EXPECT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("sync cycle"));
+  EXPECT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
 
   AutofillKeys expected_keys;
   expected_keys.insert(AutofillKey("name0", "value0"));
   expected_keys.insert(AutofillKey("name0", "value1"));
   expected_keys.insert(AutofillKey("name1", "value2"));
   expected_keys.insert(AutofillKey("name2", "value3"));
   expected_keys.insert(AutofillKey("name3", "value3"));
 
   AutofillKeys wd0_keys;
   GetAllAutofillKeys(GetWebDataService(0), &wd0_keys);
@@ skipping 81 matching lines @@
 
   AutoFillProfiles expected_profiles;
   expected_profiles.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(MARION, expected_profiles[0]);
   expected_profiles.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(HOMER, expected_profiles[1]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[1]);
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(0))));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(1))));
   STLDeleteElements(&expected_profiles);
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest,
                        ProfileSameLabelOnDifferentClients) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutoFillProfiles profiles1;
   profiles1.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(HOMER, profiles1[0]);
 
   AutoFillProfiles profiles2;
   profiles2.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(MARION, profiles2[0]);
   profiles2[0]->set_label(ASCIIToUTF16("Shipping"));
 
   AddProfile(GetPersonalDataManager(0), *profiles1[0]);
   AddProfile(GetPersonalDataManager(1), *profiles2[0]);
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
 
   // Since client1 associates first, client2's "Shipping" profile will
   // be overwritten by the one stored in the cloud by profile1.
   EXPECT_TRUE(CompareAutoFillProfiles(profiles1,
       GetAllAutoFillProfiles(GetPersonalDataManager(0))));
   EXPECT_TRUE(CompareAutoFillProfiles(profiles1,
       GetAllAutoFillProfiles(GetPersonalDataManager(1))));
   STLDeleteElements(&profiles1);
   STLDeleteElements(&profiles2);
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest,
                        ProfileSameLabelOnClient1) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutoFillProfiles expected_profiles;
   expected_profiles.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(HOMER, expected_profiles[0]);
   expected_profiles.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(HOMER, expected_profiles[1]);
 
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[1]);
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
 
   // One of the duplicate profiles will have its label renamed to
   // "Shipping2".
   expected_profiles[0]->set_label(ASCIIToUTF16("Shipping2"));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(0))));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(1))));
   STLDeleteElements(&expected_profiles);
@@ skipping 68 matching lines @@
   STLDeleteElements(&expected_profiles);
   RemoveProfile(GetPersonalDataManager(1), ASCIIToUTF16("Billing"));
   RemoveProfile(GetPersonalDataManager(1), ASCIIToUTF16("Billing2"));
   EXPECT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(0))));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(1))));
 }