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

components/autofill/browser/autofill_manager.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 COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 40 matching lines @@
 class Rect;
 class RectF;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace autofill {
 
+class AutofillDataModel;
 class AutofillExternalDelegate;
 class AutofillField;
 class AutofillProfile;
 class AutofillManagerDelegate;
 class AutofillManagerTestDelegate;
 class AutofillMetrics;
 class CreditCard;
 class FormStructureBrowserTest;
-class FormGroup;
 class PasswordGenerator;
 
 struct FormData;
 struct FormFieldData;
 struct PasswordFormFillData;
 
 // Manages saving and restoring the user's personal information entered into web
 // forms.
 class AutofillManager : public content::WebContentsObserver,
                         public AutofillDownloadManager::Observer,
@@ skipping 215 matching lines @@
   virtual std::string GetAutocheckoutURLPrefix() const;
 
   // Fills |host| with the RenderViewHost for this tab.
   // Returns false if Autofill is disabled or if the host is unavailable.
   bool GetHost(content::RenderViewHost** host) const WARN_UNUSED_RESULT;
 
   // Unpacks |unique_id| and fills |form_group| and |variant| with the
   // appropriate data source and variant index.  Returns false if the unpacked
   // id cannot be found.
   bool GetProfileOrCreditCard(int unique_id,
-                              const FormGroup** form_group,
+                              const AutofillDataModel** data_model,
                               size_t* variant) const WARN_UNUSED_RESULT;
 
   // Fills |form_structure| cached element corresponding to |form|.
   // Returns false if the cached element was not found.
   bool FindCachedForm(const FormData& form,
                       FormStructure** form_structure) const WARN_UNUSED_RESULT;
 
   // Fills |form_structure| and |autofill_field| with the cached elements
   // corresponding to |form| and |field|.  This might have the side-effect of
   // updating the cache.  Returns false if the |form| is not autofillable, or if
@@ skipping 145 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_H_