[Sync] Fix flaky TwoClientAutofillSyncTest.ConflictingFields.

chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc

 
 // Copyright (c) 2012 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/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sync/test/integration/autofill_helper.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 28 matching lines @@
 using autofill_helper::RemoveProfile;
 using autofill_helper::SetCreditCards;
 using autofill_helper::UpdateProfile;
 using bookmarks_helper::AddFolder;
 using bookmarks_helper::AddURL;
 using bookmarks_helper::IndexedURL;
 using bookmarks_helper::IndexedURLTitle;
 
 class TwoClientAutofillSyncTest : public SyncTest {
  public:
-  TwoClientAutofillSyncTest() : SyncTest(TWO_CLIENT) { count = 0; }
+  TwoClientAutofillSyncTest() : SyncTest(TWO_CLIENT) {}
   ~TwoClientAutofillSyncTest() override {}
 
   bool TestUsesSelfNotifications() override { return false; }
 
-  // We do this so as to make a change that will trigger the autofill to sync.
-  // By default autofill does not sync unless there is some other change.
-  void MakeABookmarkChange(int profile) {
-    ASSERT_TRUE(
-        AddURL(profile, IndexedURLTitle(count), GURL(IndexedURL(count))));
-    ++count;
-  }
  private:
-  int count;
   DISALLOW_COPY_AND_ASSIGN(TwoClientAutofillSyncTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, WebDataServiceSanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Client0 adds a key.
   std::set<AutofillKey> keys;
   keys.insert(AutofillKey("name0", "value0"));
   AddKeys(0, keys);
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillKeysChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllKeys(0).size());
 
   // Client1 adds a key.
   keys.clear();
   keys.insert(AutofillKey("name1", "value1-0"));
   AddKeys(1, keys);
-  MakeABookmarkChange(1);
   ASSERT_TRUE(AutofillKeysChecker(0, 1).Wait());
   ASSERT_EQ(2U, GetAllKeys(0).size());
 
   // Client0 adds a key with the same name.
   keys.clear();
   keys.insert(AutofillKey("name1", "value1-1"));
   AddKeys(0, keys);
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillKeysChecker(0, 1).Wait());
   ASSERT_EQ(3U, GetAllKeys(0).size());
 
   // Client1 removes a key.
   RemoveKey(1, AutofillKey("name1", "value1-0"));
-  MakeABookmarkChange(1);
   ASSERT_TRUE(AutofillKeysChecker(0, 1).Wait());
   ASSERT_EQ(2U, GetAllKeys(0).size());
 
   // Client0 removes the rest.
   RemoveKey(0, AutofillKey("name0", "value0"));
   RemoveKey(0, AutofillKey("name1", "value1-1"));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillKeysChecker(0, 1).Wait());
   ASSERT_EQ(0U, GetAllKeys(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, AddUnicodeProfile) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   std::set<AutofillKey> keys;
   keys.insert(AutofillKey(base::WideToUTF16(L"Sigur R\u00F3s"),
                           base::WideToUTF16(L"\u00C1g\u00E6tis byrjun")));
@@ skipping 35 matching lines @@
   ASSERT_TRUE(AutofillKeysChecker(0, 1).Wait());
   ASSERT_EQ(5U, GetAllKeys(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest,
                        PersonalDataManagerSanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Client0 adds a profile.
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   // Client1 adds a profile.
   AddProfile(1, CreateAutofillProfile(PROFILE_MARION));
-  MakeABookmarkChange(1);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(2U, GetAllAutoFillProfiles(0).size());
 
   // Client0 adds the same profile.
   AddProfile(0, CreateAutofillProfile(PROFILE_MARION));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(2U, GetAllAutoFillProfiles(0).size());
 
   // Client1 removes a profile.
   RemoveProfile(1, GetAllAutoFillProfiles(1)[0]->guid());
-  MakeABookmarkChange(1);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   // Client0 updates a profile.
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::NAME_FIRST),
                 base::ASCIIToUTF16("Bart"));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   // Client1 removes remaining profile.
   RemoveProfile(1, GetAllAutoFillProfiles(1)[0]->guid());
-  MakeABookmarkChange(1);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(0U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, AddDuplicateProfiles) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ skipping 21 matching lines @@
 
   AddProfile(0, CreateAutofillProfile(PROFILE_NULL));
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(0U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, AddProfile) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, AddMultipleProfiles) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
   AddProfile(0, CreateAutofillProfile(PROFILE_MARION));
   AddProfile(0, CreateAutofillProfile(PROFILE_FRASIER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(3U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, DeleteProfile) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   RemoveProfile(1, GetAllAutoFillProfiles(1)[0]->guid());
-  MakeABookmarkChange(1);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(0U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, MergeProfiles) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
   AddProfile(1, CreateAutofillProfile(PROFILE_MARION));
   AddProfile(1, CreateAutofillProfile(PROFILE_FRASIER));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(3U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, UpdateFields) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::NAME_FIRST),
                 base::ASCIIToUTF16("Lisa"));
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::EMAIL_ADDRESS),
                 base::ASCIIToUTF16("grrrl@TV.com"));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, ConflictingFields) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
+
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::NAME_FIRST),
                 base::ASCIIToUTF16("Lisa"));
-  MakeABookmarkChange(0);
   UpdateProfile(1,
                 GetAllAutoFillProfiles(1)[0]->guid(),
                 AutofillType(autofill::NAME_FIRST),
                 base::ASCIIToUTF16("Bart"));
-  MakeABookmarkChange(1);
+
+  // Don't care which write wins the conflict, only that the two clients agree.
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, MaxLength) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   base::string16 max_length_string(AutofillTable::kMaxDataLength, '.');
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::NAME_FULL),
                 max_length_string);
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::EMAIL_ADDRESS),
                 max_length_string);
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::ADDRESS_HOME_LINE1),
                 max_length_string);
 
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, ExceedsMaxLength) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-  MakeABookmarkChange(0);
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   base::string16 exceeds_max_length_string(
       AutofillTable::kMaxDataLength + 1, '.');
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::NAME_FIRST),
                 exceeds_max_length_string);
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::NAME_LAST),
                 exceeds_max_length_string);
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::EMAIL_ADDRESS),
                 exceeds_max_length_string);
   UpdateProfile(0,
                 GetAllAutoFillProfiles(0)[0]->guid(),
                 AutofillType(autofill::ADDRESS_HOME_LINE1),
                 exceeds_max_length_string);
 
-  MakeABookmarkChange(0);
   ASSERT_TRUE(BookmarksMatchChecker().Wait());
   EXPECT_FALSE(ProfilesMatch(0, 1));
 }
 
 // Test credit cards don't sync.
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, NoCreditCardSync) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
-
   CreditCard card;
   card.SetRawInfo(autofill::CREDIT_CARD_NUMBER,
                   base::ASCIIToUTF16("6011111111111117"));
-  std::vector<CreditCard> credit_cards;
-  credit_cards.push_back(card);
+  std::vector<CreditCard> credit_cards{card};
   SetCreditCards(0, &credit_cards);
 
-  MakeABookmarkChange(0);
+  AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
+
+  // Because the credit card was created before the profile, if we wait for the
+  // profile to sync between both clients, it should give the credit card enough
+  // time to sync. We cannot directly wait/block for the credit card to sync
+  // because we're expecting it to not sync.
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
   ASSERT_EQ(1U, GetAllAutoFillProfiles(0).size());
 
   PersonalDataManager* pdm = GetPersonalDataManager(1);
   ASSERT_EQ(0U, pdm->GetCreditCards().size());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest,
     E2E_ONLY(TwoClientsAddAutofillProfiles)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ skipping 11 matching lines @@
   AddProfile(0, CreateUniqueAutofillProfile());
 
   ASSERT_TRUE(AutofillProfileChecker(0, 1).Wait());
 
   // Check that the total number of autofill profiles is as expected
   for (int i = 0; i < num_clients(); ++i) {
     ASSERT_EQ(GetProfileCount(i), init_autofill_profiles_count + 1) <<
         "Total autofill profile count is wrong.";
   }
 }