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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 17 matching lines @@
 #include "components/autofill/browser/wallet/wallet_client.h"
 #include "components/autofill/browser/wallet/wallet_client_delegate.h"
 #include "components/autofill/browser/wallet/wallet_signin_helper_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/ssl_status.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/ui_base_types.h"
 
-class FormGroup;
 class Profile;
 class PrefRegistrySyncable;
 
 namespace content {
 class WebContents;
 }
 
 namespace autofill {
 
+class AutofillDataModel;
 class AutofillDialogView;
 class AutofillPopupControllerImpl;
 class DataModelWrapper;
 
 namespace risk {
 class Fingerprint;
 }
 
 namespace wallet {
 class WalletSigninHelper;
@@ skipping 237 matching lines @@
   // Fills in |section|-related fields in |output_| according to the state of
   // |view_|.
   void FillOutputForSection(DialogSection section);
   // As above, but uses |compare| to determine whether a DetailInput matches
   // a field. Saves any new Autofill data to the PersonalDataManager.
   void FillOutputForSectionWithComparator(DialogSection section,
                                           const InputFieldComparator& compare);
 
   // Fills in |form_structure_| using |form_group|. Utility method for
   // FillOutputForSection.
-  void FillFormStructureForSection(const FormGroup& form_group,
+  void FillFormStructureForSection(const AutofillDataModel& data_model,
                                    size_t variant,
                                    DialogSection section,
                                    const InputFieldComparator& compare);
 
   // Sets the CVC result on |form_structure_| to the value in |cvc|.
   void SetCvcResult(const string16& cvc);
 
   // Gets the SuggestionsMenuModel for |section|.
   SuggestionsMenuModel* SuggestionsMenuModelForSection(DialogSection section);
   const SuggestionsMenuModel* SuggestionsMenuModelForSection(
@@ skipping 211 matching lines @@
 
   // Whether or not there was an error in the Autocheckout flow.
   bool had_autocheckout_error_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_