[Autofill] Split off AutofillDataModel as a subclass of FormData.

components/autofill/browser/autofill_profile.h

 // Copyright (c) 2012 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 COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
 
 #include <stddef.h>
 
 #include <iosfwd>
 #include <list>
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "components/autofill/browser/address.h"
+#include "components/autofill/browser/autofill_data_model.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/contact_info.h"
 #include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_group.h"
 #include "components/autofill/browser/phone_number.h"
 
 namespace autofill {
 
 struct FormFieldData;
 
 // A collection of FormGroups stored in a profile.  AutofillProfile also
 // implements the FormGroup interface so that owners of this object can request
 // form information from the profile, and the profile will delegate the request
 // to the requested form group type.
-class AutofillProfile : public FormGroup {
+class AutofillProfile : public AutofillDataModel {
  public:
   explicit AutofillProfile(const std::string& guid);
 
   // For use in STL containers.
   AutofillProfile();
   AutofillProfile(const AutofillProfile& profile);
   virtual ~AutofillProfile();
 
   AutofillProfile& operator=(const AutofillProfile& profile);
 
   // FormGroup:
-  virtual std::string GetGUID() const OVERRIDE;
   virtual void GetMatchingTypes(const base::string16& text,
                                 const std::string& app_locale,
                                 FieldTypeSet* matching_types) const OVERRIDE;
   virtual base::string16 GetRawInfo(AutofillFieldType type) const OVERRIDE;
   virtual void SetRawInfo(AutofillFieldType type,
                           const base::string16& value) OVERRIDE;
   virtual base::string16 GetInfo(AutofillFieldType type,
                            const std::string& app_locale) const OVERRIDE;
   virtual bool SetInfo(AutofillFieldType type,
                        const base::string16& value,
                        const std::string& app_locale) OVERRIDE;
+
+  // AutofillDataModel:
   virtual void FillFormField(const AutofillField& field,
                              size_t variant,
                              const std::string& app_locale,
                              FormFieldData* field_data) const OVERRIDE;
 
   // Multi-value equivalents to |GetInfo| and |SetInfo|.
   void SetRawMultiInfo(AutofillFieldType type,
                        const std::vector<base::string16>& values);
   void GetRawMultiInfo(AutofillFieldType type,
                        std::vector<base::string16>* values) const;
   void GetMultiInfo(AutofillFieldType type,
                     const std::string& app_locale,
                     std::vector<base::string16>* values) const;
 
   // Set |field_data|'s value for phone number based on contents of |this|.
   // The |field| specifies the type of the phone and whether this is a
   // phone prefix or suffix.  The |variant| parameter specifies which value in a
   // multi-valued profile.
   void FillPhoneNumberField(const AutofillField& field,
                             size_t variant,
                             const std::string& app_locale,
                             FormFieldData* field_data) const;
 
   // 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.
   const base::string16 Label() const;
 
-  // This guid is the primary identifier for |AutofillProfile| objects.
-  // TODO(estade): remove this and just use GetGUID(). |guid_| can probably
-  // be moved to FormGroup.
-  const std::string guid() const { return guid_; }
-  void set_guid(const std::string& guid) { guid_ = guid; }
-
   // Returns true if there are no values (field types) set.
   bool IsEmpty(const std::string& app_locale) const;
 
   // Comparison for Sync.  Returns 0 if the profile is the same as |this|,
   // or < 0, or > 0 if it is different.  The implied ordering can be used for
   // culling duplicates.  The ordering is based on collation order of the
   // textual contents of the fields.
   // GUIDs are not compared, only the values of the contents themselves.
   // Full profile comparision, comparison includes multi-valued fields.
   int Compare(const AutofillProfile& profile) const;
@@ skipping 92 matching lines @@
 
   // Utilities for listing and lookup of the data members that constitute
   // user-visible profile information.
   FormGroupList FormGroups() const;
   const FormGroup* FormGroupForType(AutofillFieldType type) const;
   FormGroup* MutableFormGroupForType(AutofillFieldType type);
 
   // The label presented to the user when selecting a profile.
   base::string16 label_;
 
-  // The guid of this profile.
-  std::string guid_;
-
   // Personal information for this profile.
   std::vector<NameInfo> name_;
   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);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_