Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/autofill_profile.h

Index: components/autofill/core/browser/autofill_profile.h
diff --git a/components/autofill/core/browser/autofill_profile.h b/components/autofill/core/browser/autofill_profile.h
index 11a6c59b3fcf5d2056c395a279f37fa5a16c61e4..9fcb061ac81e0e05ce187893da54e64a994bb65e 100644
--- a/components/autofill/core/browser/autofill_profile.h
+++ b/components/autofill/core/browser/autofill_profile.h
@@ -99,12 +99,6 @@ class AutofillProfile : public AutofillDataModel {
   bool operator==(const AutofillProfile& profile) const;
   virtual bool operator!=(const AutofillProfile& profile) const;
 
-  // Returns concatenation of first name, last name, address line 1 and city,
-  // with each part separated by a whitespace. This acts as the basis of
-  // comparison for new values that are submitted through forms to aid with
-  // correct aggregation of new data.
-  const base::string16 PrimaryValue(const std::string& app_locale) const;
-
   // Returns true if the data in this AutofillProfile is a subset of the data in
   // |profile|.
   bool IsSubsetOf(const AutofillProfile& profile,
@@ -177,16 +171,6 @@ class AutofillProfile : public AutofillDataModel {
   // use.
   void RecordAndLogUse();
 
-  // TODO(crbug.com/574081): Move common profile methods to a utils file.
-  // Returns a standardized representation of the given string for comparison
-  // purposes. The resulting string will be lower-cased with all punctuation
-  // substituted by spaces. Whitespace will be converted to ASCII space, and
-  // multiple whitespace characters will be collapsed.
-  //
-  // This string is designed for comparison purposes only and isn't suitable
-  // for storing or displaying to the user.
-  static base::string16 CanonicalizeProfileString(const base::string16& str);
-
  private:
   typedef std::vector<const FormGroup*> FormGroupList;