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

chrome/browser/autofill/autofill_profile.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <stddef.h>
 
@@ skipping 41 matching lines @@
                     std::vector<string16>* values) const;
   void GetCanonicalizedMultiInfo(AutofillFieldType type,
                                  std::vector<string16>* values) const;
 
   // Returns |true| if |type| accepts multi-values.
   static bool SupportsMultiValue(AutofillFieldType type);
 
   // 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_; }
   void set_guid(const std::string& guid) { guid_ = guid; }
 
   // Accessors for the stored address's country code.
   const std::string CountryCode() const;
   void SetCountryCode(const std::string& country_code);
 
   // Adjusts the labels according to profile data.
@@ skipping 42 matching lines @@
   // Equality operators compare GUIDs and the contents in the comparison.
   // TODO(dhollowa): This needs to be made multi-profile once Sync updates.
   bool operator==(const AutofillProfile& profile) const;
   virtual bool operator!=(const AutofillProfile& profile) const;
 
   // Returns concatenation of full name and address line 1.  This acts as the
   // basis of comparison for new values that are submitted through forms to
   // 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);
 
  private:
   typedef std::vector<const FormGroup*> FormGroupList;
 
   // FormGroup implementation.
   virtual void GetSupportedTypes(FieldTypeSet* supported_types) const OVERRIDE;
 
@@ skipping 45 matching lines @@
   std::vector<EmailInfo> email_;
   CompanyInfo company_;
   std::vector<PhoneNumber> home_number_;
   Address address_;
 };
 
 // So we can compare AutofillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_