Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/autofill_profile.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_AUTOFILL_PROFILE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_
 
 #include <stddef.h>
 
 #include <iosfwd>
@@ skipping 81 matching lines @@
   // Same as operator==, but ignores differences in guid and cares about
   // differences in usage stats.
   bool EqualsForSyncPurposes(const AutofillProfile& profile) const;
 
   // Equality operators compare GUIDs, origins, language code, and the contents
   // in the comparison. Usage metadata (use count, use date, modification date)
   // are NOT compared.
   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,
                   const std::string& app_locale) const;
 
   // Like IsSubsetOf, but only considers the types present in |types|.
   bool IsSubsetOfForFieldSet(const AutofillProfile& profile,
                              const std::string& app_locale,
                              const ServerFieldTypeSet& types) const;
 
-  // Overwrites the field data in this Profile with the non-empty fields in
-  // |profile|. Returns |true| if at least one field was overwritten.
-  // The usage stats, the origin and the language code are always updated and
-  // have no effect on the return value.
-  bool OverwriteWith(const AutofillProfile& profile,
+  // Merges the data from |this| profile and the given |profile| into |this|
+  // profile. Expects that |this| and |profile| have already been deemed
+  // mergeable by an AutofillProfileComparator.
+  bool MergeDataFrom(const AutofillProfile& profile,
                      const std::string& app_locale);
 
   // Saves info from |profile| into |this|, provided |this| and |profile| do not
   // have any direct conflicts (i.e. data is present but different). Will not
   // make changes if |this| is verified and |profile| is not. Returns true if
   // |this| and |profile| are similar.
   bool SaveAdditionalInfo(const AutofillProfile& profile,

[Roger McFarlane (Chromium), 2016/06/29 18:26:19]

Maybe (in a follow-on CL?) rename MergeDataFrom() above to MergeDataFromImpl()
and rename this to MergeDataFrom() and have it:

  Perform the mergeability check
  Enforce the Verified vs !Verified constraints.
  Call MergeDataFromImpl
  Update the stats.

MergeDataFromImpl can then be made private (?)

[sebsg, 2016/06/29 19:04:50]

I agree, let's do that.

                           const std::string& app_locale);
 
   // Returns |true| if |type| accepts multi-values.
   static bool SupportsMultiValue(ServerFieldType type);
 
   // Creates a differentiating label for each of the |profiles|.
   // Labels consist of the minimal differentiating combination of:
   // 1. Full name.
   // 2. Address.
   // 3. E-mail.
@@ skipping 30 matching lines @@
 
   // Creates an identifier and saves it as |server_id_|. Only used for
   // server credit cards. The server doesn't attach an identifier so Chrome
   // creates its own. The ID is a hash of the data contained in the profile.
   void GenerateServerProfileIdentifier();
 
   // Logs the number of days since the profile was last used and records its
   // 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;
 
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   // Builds inferred label from the first |num_fields_to_include| non-empty
   // fields in |label_fields|. Uses as many fields as possible if there are not
   // enough non-empty fields.
   base::string16 ConstructInferredLabel(
@@ skipping 13 matching lines @@
       size_t num_fields_to_include,
       const std::string& app_locale,
       std::vector<base::string16>* labels);
 
   // Utilities for listing and lookup of the data members that constitute
   // user-visible profile information.
   FormGroupList FormGroups() const;
   const FormGroup* FormGroupForType(const AutofillType& type) const;
   FormGroup* MutableFormGroupForType(const AutofillType& type);
 
-  // If |name| has the same full name representation as |name_|,
-  // this will keep the one that has more information (i.e.
-  // is not reconstructible via a heuristic parse of the full name string).
-  // Returns |true| is |name_| was overwritten.
-  bool OverwriteName(const NameInfo& name, const std::string& app_locale);
-
   // Same as operator==, but ignores differences in GUID.
   bool EqualsSansGuid(const AutofillProfile& profile) const;
 
   RecordType record_type_;
 
   // Personal information for this profile.
   NameInfo name_;
   EmailInfo email_;
   CompanyInfo company_;
   PhoneNumber phone_number_;
   Address address_;
 
   // The BCP 47 language code that can be used to format |address_| for display.
   std::string language_code_;
 
   // ID used for identifying this profile. Only set for SERVER_PROFILEs. This is
   // a hash of the contents.
   std::string server_id_;
 };
 
 // So we can compare AutofillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_