[Autofill] Improve the merging of two profiles' names.

components/autofill/core/browser/autofill_profile.cc

Index: components/autofill/core/browser/autofill_profile.cc
diff --git a/components/autofill/core/browser/autofill_profile.cc b/components/autofill/core/browser/autofill_profile.cc
index 70b8519b09ab0c34c3f34b14a514b0ac8f7ce194..58a791af5284fa9cc954e8a82e733c7c5175002b 100644
--- a/components/autofill/core/browser/autofill_profile.cc
+++ b/components/autofill/core/browser/autofill_profile.cc
@@ -499,7 +499,9 @@ bool AutofillProfile::OverwriteName(const NameInfo& imported_name,
   l10n::CaseInsensitiveCompare compare;
   AutofillType type = AutofillType(NAME_FULL);
   base::string16 full_name = name_.GetInfo(type, app_locale);
-  if (compare.StringsEqual(full_name,
+  // Always overwrite if the name parts are empty.
+  if (!name_.NamePartsAreEmpty() &&
+      compare.StringsEqual(full_name,
                            imported_name.GetInfo(type, app_locale))) {
     // The imported name has the same full name string as the name for this
     // profile.  Because full names are _heuristically_ parsed into
@@ -514,7 +516,7 @@ bool AutofillProfile::OverwriteName(const NameInfo& imported_name,
       return false;
   }
 
-  name_ = imported_name;
+  name_.OverwriteName(imported_name);
   return true;
 }
 
@@ -585,6 +587,7 @@ bool AutofillProfile::SaveAdditionalInfo(const AutofillProfile& profile,
   ServerFieldTypeSet field_types, other_field_types;
   GetNonEmptyTypes(app_locale, &field_types);
   profile.GetNonEmptyTypes(app_locale, &other_field_types);
+
   // The address needs to be compared line by line to take into account the
   // logic for empty fields implemented in the loop.
   field_types.erase(ADDRESS_HOME_STREET_ADDRESS);
@@ -641,6 +644,7 @@ bool AutofillProfile::SaveAdditionalInfo(const AutofillProfile& profile,
         }
         continue;
       }
+
       // Special case for the state to support abbreviations. Currently only the
       // US states are supported.
       if (field_type == ADDRESS_HOME_STATE) {
@@ -664,6 +668,18 @@ bool AutofillProfile::SaveAdditionalInfo(const AutofillProfile& profile,
         }
       }
 
+      // Special case for middle name to support initials.
+      if (field_type == NAME_MIDDLE) {
+        base::string16 middle_name = GetRawInfo(NAME_MIDDLE);
+        base::string16 profile_middle_name = profile.GetRawInfo(NAME_MIDDLE);
+        // If one of the two middle names is an initial that match the first

[Mathieu, 2016/05/13 13:32:51]

matches

[sebsg, 2016/05/13 17:20:00]

Done.

+        // letter of the other middle name, they are considered equivalent.
+        if ((middle_name.size() == 1 || profile_middle_name.size() == 1) &&

[Mathieu, 2016/05/13 13:32:51]

what if exactly one of |middle_name| or |profile_middle_name| is empty string?
wouldn't checking for index [0] below be invalid?

Or is it a precondition of being in this loop? If so, perhaps a dcheck would be
good, above.

[sebsg, 2016/05/13 17:20:01]

Yes, it's a precondition in the loop. We get the non-empty types from profile.
Then there is a if in the loop that checks if that the type is not empty in
|this|. Dcheck sounds like a super idea, thanks!

+            middle_name[0] == profile_middle_name[0]) {
+          continue;
+        }
+      }
+
       if (!compare.StringsEqual(profile.GetRawInfo(field_type),
                                 GetRawInfo(field_type))) {
         return false;