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

components/autofill/core/browser/autofill_profile_comparator.cc

 // Copyright 2016 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/autofill_profile_comparator.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
@@ skipping 117 matching lines @@
 
   icu::UnicodeString value = icu::UnicodeString(result.data(), result.length());
   transliterator_->transliterate(value);
   return base::string16(value.getBuffer(), value.length());
 }
 
 bool AutofillProfileComparator::AreMergeable(const AutofillProfile& p1,
                                              const AutofillProfile& p2) const {
   // Sorted in order to relative expense of the tests to fail early and cheaply
   // if possible.
-  return HaveMergeableEmailAddresses(p1, p2) &&
-         HaveMergeableCompanyNames(p1, p2) &&
-         HaveMergeablePhoneNumbers(p1, p2) && HaveMergeableNames(p1, p2) &&
-         HaveMergeableAddresses(p1, p2);
+  DVLOG(1) << "Comparing profiles:\np1 = " << p1 << "\np2 = " << p2;
+
+  if (!HaveMergeableEmailAddresses(p1, p2)) {
+    DVLOG(1) << "Different email addresses.";
+    return false;
+  }
+
+  if (!HaveMergeableCompanyNames(p1, p2)) {
+    DVLOG(1) << "Different email company names.";
+    return false;
+  }
+
+  if (!HaveMergeablePhoneNumbers(p1, p2)) {
+    DVLOG(1) << "Different phone numbers.";
+    return false;
+  }
+
+  if (!HaveMergeableNames(p1, p2)) {
+    DVLOG(1) << "Different names.";
+    return false;
+  }
+
+  if (!HaveMergeableAddresses(p1, p2)) {
+    DVLOG(1) << "Different addresses.";
+    return false;
+  }
+
+  DVLOG(1) << "Profiles are mergeable.";
+  return true;
 }
 
 bool AutofillProfileComparator::MergeNames(const AutofillProfile& p1,
                                            const AutofillProfile& p2,
                                            NameInfo* name_info) const {
   DCHECK(HaveMergeableNames(p1, p2));
 
   const AutofillType kFullName(NAME_FULL);
   const base::string16& full_name_1 = p1.GetInfo(kFullName, app_locale_);
   const base::string16& full_name_2 = p2.GetInfo(kFullName, app_locale_);
@@ skipping 140 matching lines @@
         std::max(n1.number_of_leading_zeros(), n2.number_of_leading_zeros()));
   }
 
   PhoneNumberUtil::PhoneNumberFormat format =
       region.empty() ? PhoneNumberUtil::NATIONAL
                      : PhoneNumberUtil::INTERNATIONAL;
 
   std::string new_number;
   phone_util->Format(merged_number, format, &new_number);
 
-  VLOG(1) << "n1 = {" << n1 << "}";
-  VLOG(1) << "n2 = {" << n2 << "}";
-  VLOG(1) << "merged_number = {" << merged_number << "}";
-  VLOG(1) << "new_number = \"" << new_number << "\"";
+  DVLOG(2) << "n1 = {" << n1 << "}";
+  DVLOG(2) << "n2 = {" << n2 << "}";
+  DVLOG(2) << "merged_number = {" << merged_number << "}";
+  DVLOG(2) << "new_number = \"" << new_number << "\"";
 
   // Check if it's a North American number that's missing the area code.
   // Libphonenumber doesn't know how to format short numbers; it will still
   // include the country code prefix.
   if (merged_number.country_code() == 1 &&
       merged_number.national_number() <= 9999999 &&
       new_number.find("+1") == 0) {
     size_t offset = 2;  // The char just after "+1".
     while (offset < new_number.size() &&
            base::IsAsciiWhitespace(new_number[offset])) {
@@ skipping 425 matching lines @@
   const base::string16& address2 = rewriter.Rewrite(NormalizeForComparison(
       p2.GetInfo(AutofillType(ADDRESS_HOME_STREET_ADDRESS), app_locale_)));
   if (CompareTokens(address1, address2) == DIFFERENT_TOKENS) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace autofill