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

components/autofill/core/browser/contact_info.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/contact_info.h"
 
 #include <stddef.h>
 #include <ostream>
 #include <string>
 
@@ skipping 24 matching lines @@
   family_ = info.family_;
   full_ = info.full_;
   return *this;
 }
 
 bool NameInfo::ParsedNamesAreEqual(const NameInfo& info) const {
   return given_ == info.given_ && middle_ == info.middle_ &&
          family_ == info.family_;
 }
 
+void NameInfo::OverwriteName(const NameInfo& new_name) {
+  if (!new_name.given_.empty())
+    given_ = new_name.given_;
+
+  // For the middle name, don't overwrite a full middle name with an initial.
+  if (!new_name.middle_.empty() &&
+      (middle_.size() <= 1 || new_name.middle_.size() > 1))
+    middle_ = new_name.middle_;
+
+  if (!new_name.family_.empty())
+    family_ = new_name.family_;
+
+  if (!new_name.full_.empty())
+    full_ = new_name.full_;
+}
+
+bool NameInfo::NamePartsAreEmpty() const {
+  return given_.empty() && middle_.empty() && family_.empty();
+}
+
 void NameInfo::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(NAME_FIRST);
   supported_types->insert(NAME_MIDDLE);
   supported_types->insert(NAME_LAST);
   supported_types->insert(NAME_MIDDLE_INITIAL);
   supported_types->insert(NAME_FULL);
 }
 
 base::string16 NameInfo::GetRawInfo(ServerFieldType type) const {
   DCHECK_EQ(NAME, AutofillType(type).group());
@@ skipping 167 matching lines @@
   return base::string16();
 }
 
 void CompanyInfo::SetRawInfo(ServerFieldType type,
                              const base::string16& value) {
   DCHECK_EQ(COMPANY_NAME, type);
   company_name_ = value;
 }
 
 }  // namespace autofill