Use AutofillProfileComparator in place of ad-hoc merge logic.

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 19 matching lines @@
   if (this == &info)
     return *this;
 
   given_ = info.given_;
   middle_ = info.middle_;
   family_ = info.family_;
   full_ = info.full_;
   return *this;
 }
 
+bool NameInfo::operator==(const NameInfo& other) const {
+  if (this == &other)
+    return true;
+  return given_ == other.given_ && middle_ == other.middle_ &&
+         family_ == other.family_ && full_ == other.full_;
+}
+
 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.
@@ skipping 142 matching lines @@
 EmailInfo::~EmailInfo() {}
 
 EmailInfo& EmailInfo::operator=(const EmailInfo& info) {
   if (this == &info)
     return *this;
 
   email_ = info.email_;
   return *this;
 }
 
+bool EmailInfo::operator==(const EmailInfo& other) const {
+  return this == &other || email_ == other.email_;
+}
+
 void EmailInfo::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(EMAIL_ADDRESS);
 }
 
 base::string16 EmailInfo::GetRawInfo(ServerFieldType type) const {
   if (type == EMAIL_ADDRESS)
     return email_;
 
   return base::string16();
 }
@@ skipping 12 matching lines @@
 CompanyInfo::~CompanyInfo() {}
 
 CompanyInfo& CompanyInfo::operator=(const CompanyInfo& info) {
   if (this == &info)
     return *this;
 
   company_name_ = info.company_name_;
   return *this;
 }
 
+bool CompanyInfo::operator==(const CompanyInfo& other) const {
+  return this == &other || company_name_ == other.company_name_;
+}
+
 void CompanyInfo::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(COMPANY_NAME);
 }
 
 base::string16 CompanyInfo::GetRawInfo(ServerFieldType type) const {
   if (type == COMPANY_NAME)
     return company_name_;
 
   return base::string16();
 }
 
 void CompanyInfo::SetRawInfo(ServerFieldType type,
                              const base::string16& value) {
   DCHECK_EQ(COMPANY_NAME, type);
   company_name_ = value;
 }
 
 }  // namespace autofill