Use AutofillProfileComparator in place of ad-hoc merge logic.

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);
+  bool operator==(const NameInfo& other) const;
+  bool operator!=(const NameInfo& other) const { return !operator==(other); }
 
   // Compares |NameInfo| objects for |given_|, |middle_| and |family_| names.
   // The comparison is case sensitive.
   bool ParsedNamesAreEqual(const NameInfo& info) const;
 
   // 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.
   void OverwriteName(const NameInfo& new_name);
 
@@ skipping 30 matching lines @@
   base::string16 full_;
 };
 
 class EmailInfo : public FormGroup {
  public:
   EmailInfo();
   EmailInfo(const EmailInfo& info);
   ~EmailInfo() override;
 
   EmailInfo& operator=(const EmailInfo& info);
+  bool operator==(const EmailInfo& other) const;
+  bool operator!=(const EmailInfo& other) const { return !operator==(other); }
 
   // FormGroup:
   base::string16 GetRawInfo(ServerFieldType type) const override;
   void SetRawInfo(ServerFieldType type, const base::string16& value) override;
 
  private:
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   base::string16 email_;
 };
 
 class CompanyInfo : public FormGroup {
  public:
   CompanyInfo();
   CompanyInfo(const CompanyInfo& info);
   ~CompanyInfo() override;
 
   CompanyInfo& operator=(const CompanyInfo& info);
+  bool operator==(const CompanyInfo& other) const;
+  bool operator!=(const CompanyInfo& other) const { return !operator==(other); }
 
   // FormGroup:
   base::string16 GetRawInfo(ServerFieldType type) const override;
   void SetRawInfo(ServerFieldType type, const base::string16& value) override;
 
  private:
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   base::string16 company_name_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_