[Autofill] Dedupe similar profiles on insertion.

components/autofill/core/browser/autofill_profile.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/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <memory>
@@ skipping 413 matching lines @@
 }
 
 bool AutofillProfile::operator==(const AutofillProfile& profile) const {
   return guid() == profile.guid() && EqualsSansGuid(profile);
 }
 
 bool AutofillProfile::operator!=(const AutofillProfile& profile) const {
   return !operator==(profile);
 }
 
-const base::string16 AutofillProfile::PrimaryValue() const {
-  return GetRawInfo(NAME_FIRST) + GetRawInfo(NAME_LAST) +
-         GetRawInfo(ADDRESS_HOME_LINE1) + GetRawInfo(ADDRESS_HOME_CITY);
+const base::string16 AutofillProfile::PrimaryValue(
+    const std::string& app_locale) const {
+  std::vector<base::string16> primary_values{
+      CanonicalizeProfileString(GetInfo(AutofillType(NAME_FIRST), app_locale)),
+      CanonicalizeProfileString(GetInfo(AutofillType(NAME_LAST), app_locale)),
+      CanonicalizeProfileString(
+          GetInfo(AutofillType(ADDRESS_HOME_LINE1), app_locale)),
+      CanonicalizeProfileString(
+          GetInfo(AutofillType(ADDRESS_HOME_CITY), app_locale))};
+  return base::JoinString(primary_values, base::UTF8ToUTF16(" "));

[Roger McFarlane (Chromium), 2016/06/13 15:12:52]

Do the join first and canonicalize after.

i.e.:

  const std::vector<base::string16> primary_values = {
      GetInfo(...), GetInfo(...), GetInfo(...), ... }:
  return CanonicalizeProfileString(
      base::JoinString(primary_values, base::UTF8ToUTF16(" ")));

[sebsg, 2016/06/13 17:57:59]

Done.

 }
 
 bool AutofillProfile::IsSubsetOf(const AutofillProfile& profile,
                                  const std::string& app_locale) const {
   ServerFieldTypeSet types;
   GetSupportedTypes(&types);
   return IsSubsetOfForFieldSet(profile, app_locale, types);
 }
 
 bool AutofillProfile::IsSubsetOfForFieldSet(
@@ skipping 637 matching lines @@
             << " " << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) << " "
             << profile.language_code() << " "
             << UTF16ToUTF8(profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill