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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index adfaccb1d8a3ff0fdbcd575b3de32f41faccb768..7a76c38b4917a509b36780ee582a2131aa279280 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -35,7 +35,6 @@
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/ui_base_types.h"
 
-class FormGroup;
 class Profile;
 class PrefRegistrySyncable;
 
@@ -45,6 +44,7 @@ class WebContents;
 
 namespace autofill {
 
+class AutofillDataModel;
 class AutofillDialogView;
 class AutofillPopupControllerImpl;
 class DataModelWrapper;
@@ -302,7 +302,7 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
 
   // 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);