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::SetPreferredNameInfo(

[Ilya Sherman, 2014/05/29 07:38:03]

nit: Please name this something more like "OverwriteOrAppendNames()"

[Pritam Nikam, 2014/05/30 11:12:40]

Done.

+    const std::vector<NameInfo>& profiles) {

[Ilya Sherman, 2014/05/29 07:38:03]

nit: "profiles" -> "names"

[Pritam Nikam, 2014/05/30 11:12:40]

Done.

+  std::vector<NameInfo> append_list;

[Ilya Sherman, 2014/05/29 07:38:03]

nit: Please name this something more like "names_to_append"

[Pritam Nikam, 2014/05/30 11:12:40]

Function restructured, hence not needed.

+  std::vector<NameInfo> name_list(name_);
+  std::vector<NameInfo>::const_iterator itr = profiles.begin();

[Ilya Sherman, 2014/05/29 07:38:03]

nit: Please declare this within the scope of the for loop.

[Ilya Sherman, 2014/05/29 07:38:03]

nit: Please name this "it", as that is the common name used for iterators in the
Autofill code.

[Pritam Nikam, 2014/05/30 11:12:40]

Function restructured, hence not needed.

[Pritam Nikam, 2014/05/30 11:12:40]

Done.

+
+  for (; itr != profiles.end(); ++itr) {

[Ilya Sherman, 2014/05/29 07:38:03]

Is it ever possible for the imported profile to contain more than one name? 
(I'm actually not sure offhand, but my guess is that it is not.  I encourage you
to check.)  If it's not possible, then please remove the outer for loop, and
instead include a DCHECK to verify that there is only a single element in the
vector.

[Pritam Nikam, 2014/05/30 11:12:40]

Done.

1. HTML Form submission can have maximum 1 name in valid autofill profile.
2. "chrome://settings/autofill" can have multiple name entries but it never hit
function.
3. Autofill syncable profile may have multiple name entries (?), Not able to
explore

+    NameInfo imported_profile = *itr;
+    bool prefer_imported_profile = false;
+    bool identical_full_names = false;
+
+    for (size_t index = 0; index < name_.size(); index++) {

[Ilya Sherman, 2014/05/29 07:38:03]

nit: "index++" -> "++index"

[Pritam Nikam, 2014/05/30 11:12:40]

Done.

+      NameInfo prof = name_[index];

[Ilya Sherman, 2014/05/29 07:38:03]

nit: Please avoid using abbreviations when naming variables.

[Pritam Nikam, 2014/05/30 11:12:40]

Function restructured, hence not needed.

+      base::string16 full_name = prof.GetRawInfo(NAME_FULL);
+      if (full_name == imported_profile.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;
+        NameInfo profile_with_paresed_tokens;
+        profile_with_paresed_tokens.SetRawInfo(NAME_FULL, full_name);
+        if (prof == profile_with_paresed_tokens)
+          prefer_imported_profile = true;
+
+        if (prefer_imported_profile) {
+          name_list[index] = imported_profile;
+        } else {
+          if ((imported_profile != prof) &&
+              (imported_profile != profile_with_paresed_tokens))
+            append_list.push_back(imported_profile);

[Ilya Sherman, 2014/05/29 07:38:03]

This isn't quite right, as this variant of the name might exist further along in
the list.  It seems like what you ought to do instead is to break out of the for
loop if the name is already found in it.

It would be really good to write some tests for this code.  This is a good
opportunity to practice test-driven development [1]: by writing the tests
earlier, you're more likely to think about possible tricky cases, and then have
test coverage that can tell you whether or not you've addressed the tricky
cases.

[1] http://en.wikipedia.org/wiki/Test-driven_development

[Pritam Nikam, 2014/05/30 11:12:40]

Done.

Added test-cases to cover identical full names as well as unique names.
Ref: components/autofill/core/browser/autofill_profile_unittest.cc

+        }
+      }
+    }
+
+    if (!identical_full_names)
+      append_list.push_back(imported_profile);
+  }
+
+  if (!append_list.empty())
+    name_list.insert(name_list.end(), append_list.begin(), append_list.end());
+
+  name_.swap(name_list);
+}
+
 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)
+        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