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

components/autofill/core/browser/contact_info.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/form_group.h"
 
 namespace autofill {
 
 // A form group that stores name information.
 class NameInfo : public FormGroup {
  public:
   NameInfo();
   NameInfo(const NameInfo& info);
   ~NameInfo() override;
 
   NameInfo& operator=(const NameInfo& info);
 
   // Compares |NameInfo| objects for |given_|, |middle_| and |family_| names.
   // The comparison is case sensitive.
   bool ParsedNamesAreEqual(const NameInfo& info) const;
 
+  // Overwrites |this| NameInfo parts with the |new_name| parts if they have
+  // more information.

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

// For every non-empty NameInfo part in |new_name|, the corresponding NameInfo
part in |this| is overwritten. Special logic so that a middle initial may not
overwrite a full middle name.

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

Done.

+  void OverwriteName(const NameInfo& new_name);
+
+  // Returns true if all the name parts (first, middle and last) are empty.
+  bool NamePartsAreEmpty() const;
+
   // FormGroup:
   base::string16 GetRawInfo(ServerFieldType type) const override;
   void SetRawInfo(ServerFieldType type, const base::string16& value) override;
   base::string16 GetInfo(const AutofillType& type,
                          const std::string& app_locale) const override;
   bool SetInfo(const AutofillType& type,
                const base::string16& value,
                const std::string& app_locale) override;
 
  private:
@@ skipping 51 matching lines @@
  private:
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   base::string16 company_name_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_