AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/autofill_profile.h

 // Copyright (c) 2010 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 CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 11 matching lines @@
  public:
   AutoFillProfile(const string16& label, int unique_id);
   // For use in STL containers.
   AutoFillProfile();
   AutoFillProfile(const AutoFillProfile&);
   virtual ~AutoFillProfile();
 
   // 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
   // profile data.
   virtual void FindInfoMatches(const AutoFillType& type,
                                const string16& info,
                                std::vector<string16>* matched_text) const;
   virtual void SetInfo(const AutoFillType& type, const string16& value);
   // Returns a copy of the profile it is called on. The caller is responsible
   // for deleting profile when they are done with it.
   virtual FormGroup* Clone() const;
   virtual const string16& Label() const { return label_; }
 
   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
   // form:
   //     L"<first_name> <last_name>, <address_line_1>"
   // but may omit any or all of the fields if they are not present in the
   // profile.
   // The form of the string is governed by generated resources.
   string16 PreviewSummary() const;
 
@@ skipping 15 matching lines @@
   int unique_id_;
 
   // Personal information for this profile.
   FormGroupMap personal_info_;
 };
 
 // So we can compare AutoFillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutoFillProfile& profile);
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_