[Autofill] Fix the dedupe of verified profiles.

components/autofill/core/browser/personal_data_manager.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>
 #include <map>
@@ skipping 886 matching lines @@
 // TODO(crbug.com/618448): Refactor MergeProfile to not depend on class
 // variables.
 std::string PersonalDataManager::MergeProfile(
     const AutofillProfile& new_profile,
     std::vector<AutofillProfile*> existing_profiles,
     const std::string& app_locale,
     std::vector<AutofillProfile>* merged_profiles) {
   merged_profiles->clear();
 
   // Sort the existing profiles in decreasing order of frecency, so the "best"
-  // profiles are checked first.
+  // profiles are checked first. Put the verified profiles last so the non
+  // verified profiles get deduped among themselves before reaching the verified
+  // profiles.
+  // TODO(crbug.com/620521): Remove the check for verified from the sort.
   base::Time comparison_time = base::Time::Now();
   std::sort(existing_profiles.begin(), existing_profiles.end(),
             [comparison_time](const AutofillDataModel* a,
                               const AutofillDataModel* b) {
+              if (a->IsVerified() != b->IsVerified())
+                return !a->IsVerified();
               return a->CompareFrecency(b, comparison_time);
             });
 
   // Set to true if |existing_profiles| already contains an equivalent profile.
   bool matching_profile_found = false;
   std::string guid = new_profile.guid();
 
   // If we have already saved this address, merge in any missing values.
   // Only merge with the first match.
   for (AutofillProfile* existing_profile : existing_profiles) {
@@ skipping 652 matching lines @@
     // Don't try to merge a profile with itself or with any profile with a
     // different PrimaryValue.
     if (existing_profile->guid() != profile_to_merge->guid() &&
         AutofillProfile::CanonicalizeProfileString(
             existing_profile->PrimaryValue(app_locale_)) ==
             AutofillProfile::CanonicalizeProfileString(
                 profile_to_merge->PrimaryValue(app_locale_))) {
       if (existing_profile->SaveAdditionalInfo(*profile_to_merge,
                                                app_locale_)) {
         // Since |profile_to_merge| was a duplicate of |existing_profile| and
-        // was merged sucessfully, it can now be deleted.
-        profile_guids_to_delete->push_back(profile_to_merge->guid());
+        // was merged sucessfully, it can now be deleted. The only exception is
+        // if |profile_to_merge| is verified and |existing_profile| is not.
+        // Verified profiles only merge with other verified profiles.
+        if (!profile_to_merge->IsVerified() || existing_profile->IsVerified())
+          profile_guids_to_delete->push_back(profile_to_merge->guid());
 
         // Now try to merge the new resulting profile with the rest of the
         // existing profiles.
         profile_to_merge = existing_profile;
       }
     }
   }
 
   AutofillMetrics::LogNumberOfProfilesRemovedDuringDedupe(
       profile_guids_to_delete->size());
 }
 
 }  // namespace autofill