Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/address.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_ADDRESS_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_H_
 
 #include <string>
 #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 address information.
 class Address : public FormGroup {
  public:
   Address();
   Address(const Address& address);
   ~Address() override;
 
   Address& operator=(const Address& address);
+  bool operator==(const Address& other) const;
+  bool operator!=(const Address& other) const { return !operator==(other); }
 
   // FormGroup:
   base::string16 GetRawInfo(ServerFieldType type) const override;
   void SetRawInfo(ServerFieldType type, const base::string16& value) override;
   base::string16 GetInfo(const AutofillType& type,
                          const std::string& app_locale) const override;
   bool SetInfo(const AutofillType& type,
                const base::string16& value,
                const std::string& app_locale) override;
   void GetMatchingTypes(const base::string16& text,
@@ skipping 19 matching lines @@
   base::string16 sorting_code_;
 
   // The ISO 3166 2-letter country code, or an empty string if there is no
   // country data specified for this address.
   std::string country_code_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_H_