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

chrome/browser/autofill/autofill_profile.h

Index: chrome/browser/autofill/autofill_profile.h
diff --git a/chrome/browser/autofill/autofill_profile.h b/chrome/browser/autofill/autofill_profile.h
index 11750015590fdbfd0b9ec53295660509abb9966b..df6fe30dac97a197b36b9b95dbc65959a46a6b22 100644
--- a/chrome/browser/autofill/autofill_profile.h
+++ b/chrome/browser/autofill/autofill_profile.h
@@ -59,7 +59,7 @@ class AutofillProfile : public FormGroup {
   // The user-visible label of the profile, generated in relation to other
   // profiles. Shows at least 2 fields that differentiate profile from other
   // profiles. See AdjustInferredLabels() further down for more description.
-  virtual const string16 Label() const;
+  const string16 Label() const;
 
   // This guid is the primary identifier for |AutofillProfile| objects.
   const std::string guid() const { return guid_; }
@@ -122,6 +122,10 @@ class AutofillProfile : public FormGroup {
   // aid with correct aggregation of new data.
   const string16 PrimaryValue() const;
 
+  // Returns true if the data in this AutofillProfile is a subset of the data in
+  // |profile|.
+  bool IsSubsetOf(const AutofillProfile& profile) 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);