Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/phone_number.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/phone_number.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
@@ skipping 34 matching lines @@
 PhoneNumber& PhoneNumber::operator=(const PhoneNumber& number) {
   if (this == &number)
     return *this;
 
   number_ = number.number_;
   profile_ = number.profile_;
   cached_parsed_phone_ = number.cached_parsed_phone_;
   return *this;
 }
 
+bool PhoneNumber::operator==(const PhoneNumber& other) const {
+  if (this == &other)
+    return true;
+
+  return number_ == other.number_ && profile_ == other.profile_;
+}
+
 void PhoneNumber::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(PHONE_HOME_WHOLE_NUMBER);
   supported_types->insert(PHONE_HOME_NUMBER);
   supported_types->insert(PHONE_HOME_CITY_CODE);
   supported_types->insert(PHONE_HOME_CITY_AND_NUMBER);
   supported_types->insert(PHONE_HOME_COUNTRY_CODE);
 }
 
 base::string16 PhoneNumber::GetRawInfo(ServerFieldType type) const {
   DCHECK_EQ(PHONE_HOME, AutofillType(type).group());
@@ skipping 183 matching lines @@
 
   return i18n::ConstructPhoneNumber(
       country_, city_, phone_, GetRegion(profile, app_locale), value);
 }
 
 bool PhoneNumber::PhoneCombineHelper::IsEmpty() const {
   return phone_.empty() && whole_number_.empty();
 }
 
 }  // namespace autofill