Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/phone_number.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_PHONE_NUMBER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/form_group.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 
 namespace autofill {
 
 class AutofillProfile;
 
 // A form group that stores phone number information.
 class PhoneNumber : public FormGroup {
  public:
   explicit PhoneNumber(AutofillProfile* profile);
   PhoneNumber(const PhoneNumber& number);
   ~PhoneNumber() override;
 
   PhoneNumber& operator=(const PhoneNumber& number);
+  bool operator==(const PhoneNumber& other) const;
+  bool operator!=(const PhoneNumber& other) const { return !operator==(other); }
 
   void set_profile(AutofillProfile* profile) { profile_ = profile; }
 
   // FormGroup implementation:
   void GetMatchingTypes(const base::string16& text,
                         const std::string& app_locale,
                         ServerFieldTypeSet* matching_types) const override;
   base::string16 GetRawInfo(ServerFieldType type) const override;
   void SetRawInfo(ServerFieldType type, const base::string16& value) override;
   base::string16 GetInfo(const AutofillType& type,
@@ skipping 49 matching lines @@
   // Profile which stores the region used as hint when normalizing the number.
   const AutofillProfile* profile_;  // WEAK
 
   // Cached number.
   mutable i18n::PhoneObject cached_parsed_phone_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_