Modified to allow to preserve two-word string in first-name and last-name in autofill profile.

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 <ostream>
@@ skipping 341 matching lines @@
       } else if (values.size() == 0) {
         SetRawInfo(type, base::string16());
       } else {
         // Shouldn't attempt to set multiple values on single-valued field.
         NOTREACHED();
       }
       break;
   }
 }
 
+void AutofillProfile::SetPreferredNameInfo(
+    const std::vector<NameInfo>& profiles) {
+  if (!profiles.size())
+    return;
+
+  bool preferImportedProfile = true;
+  NameInfo importedProfile = profiles[0];

[Ilya Sherman, 2014/05/15 22:21:27]

Why pass a vector if you're only going to use the first item?

[Pritam Nikam, 2014/05/19 12:09:15]

Done.

+  std::vector<NameInfo> namelist(name_);
+  for (size_t index = 0; index < name_.size(); index++) {
+    NameInfo prof = name_[index];
+    if (prof.GetRawInfo(NAME_FULL) != importedProfile.GetRawInfo(NAME_FULL)) {
+      namelist.push_back(importedProfile);

[Ilya Sherman, 2014/05/15 22:21:27]

If the existing profile has 10 names, none of which match the new name, this
will add the new name 10 times.  (Or am I missing something?)

[Pritam Nikam, 2014/05/19 12:09:15]

Done.

+      continue;
+    }
+
+    // Identical full names, we should always prefer to keep ones with more
+    // information i.e. where parsing the full_name_ does not give the same
+    // results as are stored in first_, middle_, and last_. Prefer profile
+    // with smaller middle names.
+    if (prof.GetRawInfo(NAME_MIDDLE).length() <
+        importedProfile.GetRawInfo(NAME_MIDDLE).length())

[Ilya Sherman, 2014/05/15 22:21:27]

I was thinking of something more like:

base::string16 full_name = prof.GetRawInfo(NAME_FULL);
NameInfo automatically_parsed_name;
automatically_parsed_name.SetRawInfo(NAME_FULL, full_name);
bool is_automatically_parseable = (prof == automatically_parsed_name);

except with better variable names.  Conceptually, if serializing a NameInfo into
a full name string and then reparsing it gives a different result from what you
started with, then we should keep that version of the name.  Otherwise, we
shouldn't.

[Pritam Nikam, 2014/05/19 12:09:15]

Done.

+      preferImportedProfile = false;
+
+    if (preferImportedProfile) {
+      namelist[index] = importedProfile;
+    }
+  }
+  name_.swap(namelist);
+}

[Ilya Sherman, 2014/05/15 22:21:27]

There are many style guide violations in this code.  Please read through the
style guide and see if you can spot some of the issues.  I'm not pointing
specific issues out for now because there are still major structural changes
needed.

[Pritam Nikam, 2014/05/19 12:09:15]

Done.

+
 void AutofillProfile::GetRawMultiInfo(
     ServerFieldType type,
     std::vector<base::string16>* values) const {
   GetMultiInfoImpl(AutofillType(type), std::string(), values);
 }
 
 void AutofillProfile::GetMultiInfo(const AutofillType& type,
                                    const std::string& app_locale,
                                    std::vector<base::string16>* values) const {
   GetMultiInfoImpl(type, app_locale, values);
@@ skipping 175 matching lines @@
           AddPhoneIfUnique(*value_iter, app_locale, &existing_values);
         } else {
           std::vector<base::string16>::const_iterator existing_iter =
               std::find_if(
                   existing_values.begin(), existing_values.end(),
                   std::bind1st(CaseInsensitiveStringEquals(), *value_iter));
           if (existing_iter == existing_values.end())
             existing_values.insert(existing_values.end(), *value_iter);
         }
       }
-      SetRawMultiInfo(*iter, existing_values);
+
+      if (group == NAME)
+        SetPreferredNameInfo(profile.name_);
+      else
+        SetRawMultiInfo(*iter, existing_values);
     } else {
       base::string16 new_value = profile.GetRawInfo(*iter);
       if (StringToLowerASCII(GetRawInfo(*iter)) !=
               StringToLowerASCII(new_value)) {
         SetRawInfo(*iter, new_value);
       }
     }
   }
 }
 
@@ skipping 287 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << profile.language_code()
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill