More work on removing variants from Autofill

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 56 matching lines @@
 
   // How this card is stored.
   RecordType record_type() const { return record_type_; }
   void set_record_type(RecordType type) { record_type_ = type; }
 
   // Multi-value equivalents to |GetInfo| and |SetInfo|.
   void SetRawMultiInfo(ServerFieldType type,
                        const std::vector<base::string16>& values);
   void GetRawMultiInfo(ServerFieldType type,
                        std::vector<base::string16>* values) const;
-  void GetMultiInfo(const AutofillType& type,
-                    const std::string& app_locale,
-                    std::vector<base::string16>* values) const;
 
   // Returns true if there are no values (field types) set.
   bool IsEmpty(const std::string& app_locale) const;
 
   // Returns true if the |type| of data in this profile is present, but invalid.
   // Otherwise returns false.
   bool IsPresentButInvalid(ServerFieldType type) const;
 
   // Comparison for Sync.  Returns 0 if the profile is the same as |this|,
   // or < 0, or > 0 if it is different.  The implied ordering can be used for
@@ skipping 26 matching lines @@
   // 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 single-valued field data in |profile| with this
-  // Profile.  Or, for multi-valued fields append the new values.
-  void OverwriteWithOrAddTo(const AutofillProfile& profile,
-                            const std::string& app_locale);
+  // Overwrites the field data in |profile| with this Profile.
+  void OverwriteWith(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,
+                          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.
   // 4. Phone.
@@ skipping 78 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);
 
-  // Appends unique names from |names| onto the |name_| list, dropping
-  // duplicates. If a name in |names| has the same full name representation
-  // as a name in |name_|, keeps the variant that has more information (i.e.
+  // If a name in |names| has the same full name representation
+  // as a name in |name_|, keeps the one that has more information (i.e.
   // is not reconstructible via a heuristic parse of the full name string).
-  void OverwriteOrAppendNames(const std::vector<NameInfo>& names,
-                              const std::string& app_locale);
+  void OverwriteName(const NameInfo& names, const std::string& app_locale);

[please use gerrit instead, 2015/06/04 23:24:28]

s/names/name

Other places in the code usually use a singular "name" variable name when the
type is "NameInfo".

[Evan Stade, 2015/06/05 00:39:08]

Done.

 
   // Same as operator==, but ignores differences in GUID.
   bool EqualsSansGuid(const AutofillProfile& profile) const;
 
   RecordType record_type_;
 
   // Personal information for this profile.
-  std::vector<NameInfo> name_;
+  NameInfo name_;
   std::vector<EmailInfo> email_;
   CompanyInfo company_;
   std::vector<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_