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

chrome/browser/ui/autofill/data_model_wrapper.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 "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
+#include "components/autofill/browser/autofill_data_model.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/form_group.h"
 #include "components/autofill/browser/form_structure.h"
 #include "components/autofill/browser/wallet/full_wallet.h"
 #include "components/autofill/browser/wallet/wallet_address.h"
 #include "components/autofill/browser/wallet/wallet_items.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace autofill {
 
 DataModelWrapper::~DataModelWrapper() {}
@@ skipping 35 matching lines @@
 void DataModelWrapper::FillFormField(AutofillField* field) {
   field->value = GetInfo(field->type());
 }
 
 DataModelWrapper::DataModelWrapper() {}
 
 gfx::Image DataModelWrapper::GetIcon() {
   return gfx::Image();
 }
 
-// AutofillFormGroupWrapper
+// AutofillDataModelWrapper
 
-AutofillFormGroupWrapper::AutofillFormGroupWrapper(const FormGroup* form_group,
-                                                   size_t variant)
-    : form_group_(form_group),
+AutofillDataModelWrapper::AutofillDataModelWrapper(
+    const AutofillDataModel* data_model,
+    size_t variant)
+    : data_model_(data_model),
       variant_(variant) {}
 
-AutofillFormGroupWrapper::~AutofillFormGroupWrapper() {}
+AutofillDataModelWrapper::~AutofillDataModelWrapper() {}
 
-string16 AutofillFormGroupWrapper::GetInfo(AutofillFieldType type) {
-  return form_group_->GetInfo(type, g_browser_process->GetApplicationLocale());
+string16 AutofillDataModelWrapper::GetInfo(AutofillFieldType type) {
+  return data_model_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
-void AutofillFormGroupWrapper::FillFormField(AutofillField* field) {
-  form_group_->FillFormField(
+void AutofillDataModelWrapper::FillFormField(AutofillField* field) {
+  data_model_->FillFormField(
       *field, variant_, g_browser_process->GetApplicationLocale(), field);
 }
 
 // AutofillProfileWrapper
 
 AutofillProfileWrapper::AutofillProfileWrapper(
     const AutofillProfile* profile, size_t variant)
-    : AutofillFormGroupWrapper(profile, variant),
+    : AutofillDataModelWrapper(profile, variant),
       profile_(profile) {}
 
 AutofillProfileWrapper::~AutofillProfileWrapper() {}
 
 void AutofillProfileWrapper::FillInputs(DetailInputs* inputs) {
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   for (size_t j = 0; j < inputs->size(); ++j) {
     std::vector<string16> values;
     profile_->GetMultiInfo((*inputs)[j].type, app_locale, &values);
     (*inputs)[j].initial_value = values[variant()];
   }
 }
 
 // AutofillCreditCardWrapper
 
 AutofillCreditCardWrapper::AutofillCreditCardWrapper(const CreditCard* card)
-    : AutofillFormGroupWrapper(card, 0),
+    : AutofillDataModelWrapper(card, 0),
       card_(card) {}
 
 AutofillCreditCardWrapper::~AutofillCreditCardWrapper() {}
 
 string16 AutofillCreditCardWrapper::GetInfo(AutofillFieldType type) {
   if (type == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(card_->expiration_month());
 
-  return AutofillFormGroupWrapper::GetInfo(type);
+  return AutofillDataModelWrapper::GetInfo(type);
 }
 
 gfx::Image AutofillCreditCardWrapper::GetIcon() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetImageNamed(card_->IconResourceId());
 }
 
 string16 AutofillCreditCardWrapper::GetDisplayText() {
   return card_->TypeAndLastFourDigits();
 }
 
 void AutofillCreditCardWrapper::FillFormField(AutofillField* field) {
   AutofillFieldType field_type = field->type();
 
   if (field_type == NAME_FULL) {
     // Requests for the user's full name are filled from the credit card data,
     // but the CreditCard class only knows how to fill credit card fields.  So,
     // temporarily set the type to the corresponding credit card type.
     field->set_heuristic_type(CREDIT_CARD_NAME);
   }
 
-  AutofillFormGroupWrapper::FillFormField(field);
+  AutofillDataModelWrapper::FillFormField(field);
 
   field->set_heuristic_type(field_type);
 }
 
 // WalletAddressWrapper
 
 WalletAddressWrapper::WalletAddressWrapper(
     const wallet::Address* address) : address_(address) {}
 
 WalletAddressWrapper::~WalletAddressWrapper() {}
@@ skipping 55 matching lines @@
 }
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) {
   return full_wallet_->shipping_address()->GetInfo(
       type, g_browser_process->GetApplicationLocale());
 }
 
 }  // namespace autofill