[Merge M53] Run autofill-profile de-dupe after sync starts if sync is enabled.

components/autofill/core/browser/personal_data_manager_unittest.cc

 // Copyright 2013 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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 158 matching lines @@
   void ResetPersonalDataManager(UserMode user_mode) {
     bool is_incognito = (user_mode == USER_MODE_INCOGNITO);
     personal_data_.reset(new PersonalDataManager("en"));
     personal_data_->Init(
         scoped_refptr<AutofillWebDataService>(autofill_database_service_),
         prefs_.get(),
         account_tracker_.get(),
         signin_manager_.get(),
         is_incognito);
     personal_data_->AddObserver(&personal_data_observer_);
+    personal_data_->OnSyncServiceInitialized(nullptr);
 
     // Verify that the web database has been updated and the notification sent.
     EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
         .WillOnce(QuitMainMessageLoop());
     base::RunLoop().Run();
   }
 
   void ResetProfiles() {
     std::vector<AutofillProfile> empty_profiles;
     personal_data_->SetProfiles(&empty_profiles);
   }
 
   void EnableWalletCardImport() {
     signin_manager_->SetAuthenticatedAccountInfo("12345",
                                                  "syncuser@example.com");
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableOfferStoreUnmaskedWalletCards);
   }
 
   void EnableAutofillProfileCleanup() {
     base::FeatureList::ClearInstanceForTesting();
     std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
     feature_list->InitializeFromCommandLine(kAutofillProfileCleanup.name,
                                             std::string());
     base::FeatureList::SetInstance(std::move(feature_list));
+    personal_data_->is_autofill_profile_dedupe_pending_ = true;
   }
 
   void SetupReferenceProfile() {
     ASSERT_EQ(0U, personal_data_->GetProfiles().size());
 
     AutofillProfile profile(base::GenerateGUID(), "https://www.example.com");
     test::SetProfileInfo(&profile, "Marion", "Mitchell", "Morrison",
                          "johnwayne@me.xyz", "Fox", "123 Zoo St", "unit 5",
                          "Hollywood", "CA", "91601", "US", "12345678910");
     personal_data_->AddProfile(profile);
@@ skipping 4380 matching lines @@
 
   // Make sure the 3 profiles were saved;
   EXPECT_EQ(3U, personal_data_->GetProfiles().size());
 
   // Enable the profile cleanup now. Otherwise it would be triggered by the
   // calls to AddProfile.
   EnableAutofillProfileCleanup();
 
   base::HistogramTester histogram_tester;
 
-  personal_data_->ApplyDedupingRoutine();
+  EXPECT_TRUE(personal_data_->ApplyDedupingRoutine());
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   std::vector<AutofillProfile*> profiles = personal_data_->GetProfiles();
 
   // |profile1| should have been merged into |profile2| which should then have
   // been merged into |profile3|. Therefore there should only be 1 saved
   // profile.
   ASSERT_EQ(1U, profiles.size());
@@ skipping 72 matching lines @@
 
   // Make sure the 3 profiles were saved.
   EXPECT_EQ(3U, personal_data_->GetProfiles().size());
 
   // Enable the profile cleanup now. Otherwise it would be triggered by the
   // calls to AddProfile.
   EnableAutofillProfileCleanup();
 
   base::HistogramTester histogram_tester;
 
-  personal_data_->ApplyDedupingRoutine();
+  EXPECT_TRUE(personal_data_->ApplyDedupingRoutine());
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   std::vector<AutofillProfile*> profiles = personal_data_->GetProfiles();
 
   // |profile2| should have merged with |profile3|. |profile3|
   // should then have been discarded because it is similar to the verified
   // |profile1|.
   ASSERT_EQ(1U, profiles.size());
@@ skipping 51 matching lines @@
 
   // Make sure the 3 profiles were saved.
   EXPECT_EQ(3U, personal_data_->GetProfiles().size());
 
   // Enable the profile cleanup now. Otherwise it would be triggered by the
   // calls to AddProfile.
   EnableAutofillProfileCleanup();
 
   base::HistogramTester histogram_tester;
 
-  personal_data_->ApplyDedupingRoutine();
+  EXPECT_TRUE(personal_data_->ApplyDedupingRoutine());
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   std::vector<AutofillProfile*> profiles = personal_data_->GetProfiles();
 
   // |profile1| should have merged with |profile2|. |profile2|
   // should then have been discarded because it is similar to the verified
   // |profile3|.
   ASSERT_EQ(1U, profiles.size());
@@ skipping 50 matching lines @@
 
   // Make sure the 3 profiles were saved.
   EXPECT_EQ(3U, personal_data_->GetProfiles().size());
 
   // Enable the profile cleanup now. Otherwise it would be triggered by the
   // calls to AddProfile.
   EnableAutofillProfileCleanup();
 
   base::HistogramTester histogram_tester;
 
-  personal_data_->ApplyDedupingRoutine();
+  EXPECT_TRUE(personal_data_->ApplyDedupingRoutine());
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   // Get the profiles, sorted by frecency to have a deterministic order.
   std::vector<AutofillProfile*> profiles =
       personal_data_->GetProfilesToSuggest();
 
   // |profile1| should have been discarded because the saved profile with the
   // highest frecency score is verified (|profile2|). Therefore, |profile1|'s
@@ skipping 209 matching lines @@
 
   // Enable the profile cleanup now. Otherwise it would be triggered by the
   // calls to AddProfile.
   EnableAutofillProfileCleanup();
 
   base::HistogramTester histogram_tester;
 
   // |Homer1| should get merged into |Homer2| which should then be merged into
   // |Homer3|. |Marge2| should be discarded in favor of |Marge1| which is
   // verified. |Homer4| and |Barney| should not be deduped at all.
-  personal_data_->ApplyDedupingRoutine();
+  EXPECT_TRUE(personal_data_->ApplyDedupingRoutine());
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   // Get the profiles, sorted by frecency to have a deterministic order.
   std::vector<AutofillProfile*> profiles =
       personal_data_->GetProfilesToSuggest();
 
   // The 2 duplicates Homer home profiles with the higher frecency and the
   // unverified Marge profile should have been deduped.
@@ skipping 135 matching lines @@
   EnableAutofillProfileCleanup();
 
   // The deduping routine should not be run.
   EXPECT_FALSE(personal_data_->ApplyDedupingRoutine());
 
   // The two duplicate profiles should still be present.
   EXPECT_EQ(2U, personal_data_->GetProfiles().size());
 }
 
 }  // namespace autofill