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

components/autofill/browser/credit_card.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_CREDIT_CARD_H_
 #define COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_H_
 
 #include <iosfwd>
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "components/autofill/browser/autofill_data_model.h"
 #include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_group.h"
 
 namespace autofill {
 
 struct FormFieldData;
 
 // A form group that stores credit card information.
-class CreditCard : public FormGroup {
+class CreditCard : public AutofillDataModel {
  public:
   explicit CreditCard(const std::string& guid);
 
   // For use in STL containers.
   CreditCard();
   CreditCard(const CreditCard& credit_card);
   virtual ~CreditCard();
 
   // Returns a version of |number| that has any separator characters removed.
   static const base::string16 StripSeparators(const base::string16& number);
 
   // The user-visible type of the card, e.g. 'Mastercard'.
   static base::string16 TypeForDisplay(const std::string& type);
 
-  // FormGroup implementation:
-  virtual std::string GetGUID() const OVERRIDE;
+  // FormGroup:
   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;
 
   // Credit card preview summary, for example: ******1234, Exp: 01/2020
   const base::string16 Label() const;
 
   // Special method to set value for HTML5 month input type.
   void SetInfoForMonthInputType(const base::string16& value);
 
   // The number altered for display, for example: ******1234
   base::string16 ObfuscatedNumber() const;
   // The last four digits of the credit card number.
   base::string16 LastFourDigits() const;
   // The user-visible type of the card, e.g. 'Mastercard'.
   base::string16 TypeForDisplay() const;
   // A label for this credit card formatted as 'Cardname - 2345'.
   base::string16 TypeAndLastFourDigits() const;
   // The ResourceBundle ID for the appropriate credit card image.
   int IconResourceId() const;
 
   const std::string& type() const { return type_; }
 
   int expiration_month() const { return expiration_month_; }
   int expiration_year() const { return expiration_year_; }
 
-  // The guid is the primary identifier for |CreditCard| objects.
-  // TODO(estade): remove this and just use GetGUID().
-  const std::string guid() const { return guid_; }
-  void set_guid(const std::string& guid) { guid_ = guid; }
-
   // For use in STL containers.
   void operator=(const CreditCard& credit_card);
 
   // If the card numbers for |this| and |imported_card| match, overwrites |this|
   // card's data with the data in |credit_card| and returns true.  Otherwise,
   // returns false.
   bool UpdateFromImportedCard(const CreditCard& imported_card,
                               const std::string& app_locale) WARN_UNUSED_RESULT;
 
   // Comparison for Sync.  Returns 0 if the credit card is the same as |this|,
@@ skipping 43 matching lines @@
   void SetExpirationMonth(int expiration_month);
   void SetExpirationYear(int expiration_year);
 
   base::string16 number_;  // The credit card number.
   base::string16 name_on_card_;  // The cardholder's name.
   std::string type_;  // The type of the card.
 
   // These members are zero if not present.
   int expiration_month_;
   int expiration_year_;
-
-  // The guid of this credit card.
-  std::string guid_;
 };
 
 // So we can compare CreditCards with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card);
 
 // The string identifiers for credit card icon resources.
 extern const char* const kAmericanExpressCard;
 extern const char* const kDinersCard;
 extern const char* const kDiscoverCard;
 extern const char* const kGenericCard;
 extern const char* const kJCBCard;
 extern const char* const kMasterCard;
 extern const char* const kSoloCard;
 extern const char* const kVisaCard;
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_H_