AutoFill: Aggregate profile data. Remove the AutoFill InfoBar. Remove more remnants of shipping address and CVV.

BUG=47426,47423
TEST=PersonalDataManager.*

Review URL: http://codereview.chromium.org/2818033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51322 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 0 deletions

diff --git a/chrome/browser/autofill/autofill_profile.h b/chrome/browser/autofill/autofill_profile.h
index 2dbcd2f..189bc55 100644
--- a/chrome/browser/autofill/autofill_profile.h
+++ b/chrome/browser/autofill/autofill_profile.h
@@ -29,6 +29,7 @@ class AutoFillProfile : public FormGroup {
   // FormGroup implementation:
   virtual void GetPossibleFieldTypes(const string16& text,
                                      FieldTypeSet* possible_types) const;
+  virtual void GetAvailableFieldTypes(FieldTypeSet* available_types) const;
   virtual string16 GetFieldText(const AutoFillType& type) const;
   // Returns true if the info matches the profile data corresponding to type.
   // If the type is UNKNOWN_TYPE then info will be matched against all of the
@@ -45,6 +46,17 @@ class AutoFillProfile : public FormGroup {
   void set_unique_id(int id) { unique_id_ = id; }
   int unique_id() const { return unique_id_; }
 
+  // Returns true if the data in this profile is a subset of the data in
+  // |profile|.
+  bool IsSubsetOf(const AutoFillProfile& profile) const;
+
+  // Returns true if the values of the intersection of the available field types
+  // are equal.  If the intersection is empty, the method returns false.
+  bool IntersectionOfTypesHasEqualValues(const AutoFillProfile& profile) const;
+
+  // Merges the profile data in |profile| with this profile.
+  void MergeWith(const AutoFillProfile& profile);
+
   // Profile summary string for UI.
   // Constructs a summary string based on NAME_FIRST, NAME_LAST, and
   // ADDRESS_HOME_LINE1 fields of the profile.  The summary string is of the