Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/contact_info.h

Index: components/autofill/core/browser/contact_info.h
diff --git a/components/autofill/core/browser/contact_info.h b/components/autofill/core/browser/contact_info.h
index 3f42902b37ef939565ea427627af262326c7889c..edadcab2d1fb80597a802836a099f1fc2b2b87ac 100644
--- a/components/autofill/core/browser/contact_info.h
+++ b/components/autofill/core/browser/contact_info.h
@@ -21,6 +21,8 @@ class NameInfo : public FormGroup {
   ~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.
@@ -71,6 +73,8 @@ class EmailInfo : public FormGroup {
   ~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;
@@ -90,6 +94,8 @@ class CompanyInfo : public FormGroup {
   ~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;