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

components/autofill/browser/credit_card.cc

Index: components/autofill/browser/credit_card.cc
diff --git a/components/autofill/browser/credit_card.cc b/components/autofill/browser/credit_card.cc
index 78765d9d1223d663a72d5ff93e5d049f8df51e0b..21971ebbec7d5314efb0f3bf5f34b737cc89bbf8 100644
--- a/components/autofill/browser/credit_card.cc
+++ b/components/autofill/browser/credit_card.cc
@@ -194,20 +194,21 @@ bool ConvertMonth(const base::string16& month,
 }  // namespace
 
 CreditCard::CreditCard(const std::string& guid)
-    : type_(kGenericCard),
+    : AutofillDataModel(guid),
+      type_(kGenericCard),
       expiration_month_(0),
-      expiration_year_(0),
-      guid_(guid) {
+      expiration_year_(0) {
 }
 
 CreditCard::CreditCard()
-    : type_(kGenericCard),
+    : AutofillDataModel(base::GenerateGUID()),
+      type_(kGenericCard),
       expiration_month_(0),
-      expiration_year_(0),
-      guid_(base::GenerateGUID()) {
+      expiration_year_(0) {
 }
 
-CreditCard::CreditCard(const CreditCard& credit_card) : FormGroup() {
+CreditCard::CreditCard(const CreditCard& credit_card)
+    : AutofillDataModel(std::string()) {
   operator=(credit_card);
 }
 
@@ -244,10 +245,6 @@ base::string16 CreditCard::TypeForDisplay(const std::string& type) {
   return base::string16();
 }
 
-std::string CreditCard::GetGUID() const {
-  return guid();
-}
-
 base::string16 CreditCard::GetRawInfo(AutofillFieldType type) const {
   switch (type) {
     case CREDIT_CARD_NAME:
@@ -488,7 +485,8 @@ void CreditCard::operator=(const CreditCard& credit_card) {
   type_ = credit_card.type_;
   expiration_month_ = credit_card.expiration_month_;
   expiration_year_ = credit_card.expiration_year_;
-  guid_ = credit_card.guid_;
+
+  set_guid(credit_card.guid());
 }
 
 bool CreditCard::UpdateFromImportedCard(const CreditCard& imported_card,
@@ -554,10 +552,7 @@ int CreditCard::Compare(const CreditCard& credit_card) const {
 }
 
 bool CreditCard::operator==(const CreditCard& credit_card) const {
-  if (guid_ != credit_card.guid_)
-    return false;
-
-  return Compare(credit_card) == 0;
+  return guid() == credit_card.guid() && Compare(credit_card) == 0;
 }
 
 bool CreditCard::operator!=(const CreditCard& credit_card) const {