Move a bunch of non-shared methods out of the FormGroup class.

chrome/browser/autofill/form_group.h

Index: chrome/browser/autofill/form_group.h
diff --git a/chrome/browser/autofill/form_group.h b/chrome/browser/autofill/form_group.h
index 1ce043069ea4f519d0ed85bf492e585333a38e7d..7cba20666d9a8fe5d07aa4885e201bff55f5abc8 100644
--- a/chrome/browser/autofill/form_group.h
+++ b/chrome/browser/autofill/form_group.h
@@ -20,7 +20,7 @@ class FormGroup {
   virtual ~FormGroup() {}
 
   // Used to determine the type of a field based on the text that a user enters
-  // into the field. The field types can then be reported back to the server.
+  // into the field.  The field types can then be reported back to the server.
   // This method is additive on |matching_types|.
   virtual void GetMatchingTypes(const string16& text,
                                 FieldTypeSet* matching_types) const;
@@ -44,25 +44,6 @@ class FormGroup {
   virtual bool SetCanonicalizedInfo(AutofillFieldType type,
                                     const string16& value);
 
-  // Returns the label for this FormGroup item. This should be overridden for
-  // form group items that implement a label.
-  virtual const string16 Label() const;
-
-  // Returns true if the field data in |form_group| does not match the field
-  // data in this FormGroup.
-  virtual bool operator!=(const FormGroup& form_group) const;
-
-  // Returns true if the data in this FormGroup is a subset of the data in
-  // |form_group|.
-  bool IsSubsetOf(const FormGroup& form_group) 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 FormGroup& form_group) const;
-
-  // Merges the field data in |form_group| with this FormGroup.
-  void MergeWith(const FormGroup& form_group);
-
  protected:
   // AutofillProfile needs to call into GetSupportedTypes() for objects of
   // non-AutofillProfile type, for which mere inheritance is insufficient.