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

components/autofill/browser/credit_card.cc

 // 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.
 
 #include "components/autofill/browser/credit_card.h"
 
 #include <stddef.h>
 
 #include <ostream>
 #include <string>
@@ skipping 176 matching lines @@
     }
   }
 
   *num = 0;
   return false;
 }
 
 }  // 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);
 }
 
 CreditCard::~CreditCard() {}
 
 // static
 const base::string16 CreditCard::StripSeparators(const base::string16& number) {
   const char16 kSeparators[] = {'-', ' ', '\0'};
   base::string16 stripped;
   RemoveChars(number, kSeparators, &stripped);
@@ skipping 16 matching lines @@
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_SOLO);
   if (type == kVisaCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA);
 
   // If you hit this DCHECK, the above list of cases needs to be updated to
   // include a new card.
   DCHECK_EQ(kGenericCard, type);
   return base::string16();
 }
 
-std::string CreditCard::GetGUID() const {
-  return guid();
-}
-
 base::string16 CreditCard::GetRawInfo(AutofillFieldType type) const {
   switch (type) {
     case CREDIT_CARD_NAME:
       return name_on_card_;
 
     case CREDIT_CARD_EXP_MONTH:
       return ExpirationMonthAsString();
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       return Expiration2DigitYearAsString();
@@ skipping 220 matching lines @@
 
 void CreditCard::operator=(const CreditCard& credit_card) {
   if (this == &credit_card)
     return;
 
   number_ = credit_card.number_;
   name_on_card_ = credit_card.name_on_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,
                                         const std::string& app_locale) {
   if (this->GetInfo(CREDIT_CARD_NUMBER, app_locale) !=
           imported_card.GetInfo(CREDIT_CARD_NUMBER, app_locale)) {
     return false;
   }
 
   // Note that the card number is intentionally not updated, so as to preserve
@@ skipping 45 matching lines @@
     int comparison = GetRawInfo(types[index]).compare(
         credit_card.GetRawInfo(types[index]));
     if (comparison != 0)
       return comparison;
   }
 
   return 0;
 }
 
 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 {
   return !operator==(credit_card);
 }
 
 bool CreditCard::IsEmpty(const std::string& app_locale) const {
   FieldTypeSet types;
   GetNonEmptyTypes(app_locale, &types);
   return types.empty();
@@ skipping 106 matching lines @@
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kSoloCard = "soloCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill