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 500 matching lines @@
       }
     } else if (StringToLowerASCII(GetRawInfo(*it)) !=
                    StringToLowerASCII(profile.GetRawInfo(*it))) {
       return false;
     }
   }
 
   return true;
 }
 
+void AutofillProfile::OverwriteOrAppendNames(
+    const std::vector<NameInfo>& names) {
+  // a valid autofill profile can't have more than one nameInfo
+  DCHECK(names.size() == 1);

[Ilya Sherman, 2014/05/31 00:34:41]

Thanks for listing the cases from which this method is reachable -- I had
forgotten that the Sync code also calls OverwriteWithOrAddTo.  It is definitely
possible for a synced profile to have multiple name variants in it, so this
DCHECK is incorrect.  I apologize for leading you astray.

[Pritam Nikam, 2014/05/31 10:30:41]

Done.

+
+  NameInfo imported_profile_name = names[0];
+  NameInfo profile_name_with_parsed_tokens;
+  bool prefer_imported_profile_name = false;
+  bool identical_full_names = false;
+
+  for (size_t index = 0; index < name_.size(); ++index) {
+    NameInfo current_name = name_[index];
+    base::string16 full_name = current_name.GetRawInfo(NAME_FULL);
+    if (full_name == imported_profile_name.GetRawInfo(NAME_FULL)) {
+      // 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_.
+      identical_full_names = true;
+      profile_name_with_parsed_tokens.SetRawInfo(NAME_FULL, full_name);
+      prefer_imported_profile_name =
+          (current_name == profile_name_with_parsed_tokens) ||
+          (current_name == imported_profile_name);
+
+      if (prefer_imported_profile_name) {
+        name_[index] = imported_profile_name;
+        break;
+      }
+    }
+  }
+
+  // Append unique names to the list
+  if (!identical_full_names ||
+      (!prefer_imported_profile_name &&
+       imported_profile_name != profile_name_with_parsed_tokens)) {
+    name_.push_back(imported_profile_name);
+  }
+}
+
 void AutofillProfile::OverwriteWithOrAddTo(const AutofillProfile& profile,
                                            const std::string& app_locale) {
   // Verified profiles should never be overwritten with unverified data.
   DCHECK(!IsVerified() || profile.IsVerified());
   set_origin(profile.origin());
   set_language_code(profile.language_code());
 
   ServerFieldTypeSet field_types;
   profile.GetNonEmptyTypes(app_locale, &field_types);
 
@@ skipping 29 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) {
+        OverwriteOrAppendNames(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