Split non-//content parts from ContentAutofillDriverFactory

components/autofill/content/browser/content_autofill_driver_factory.h

 // Copyright 2014 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_CONTENT_BROWSER_CONTENT_AUTOFILL_DRIVER_FACTORY_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_CONTENT_AUTOFILL_DRIVER_FACTORY_H_
 
-#include <map>
-#include <memory>
 #include <string>
 
 #include "base/supports_user_data.h"
 #include "components/autofill/content/common/autofill_driver.mojom.h"
+#include "components/autofill/core/browser/autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace content {
 class RenderFrameHost;
 }
 
 namespace autofill {
 
 class ContentAutofillDriver;
 
 // Manages lifetime of ContentAutofillDriver. One Factory per WebContents
 // creates one Driver per RenderFrame.
-class ContentAutofillDriverFactory : public content::WebContentsObserver,
+class ContentAutofillDriverFactory : public AutofillDriverFactory,
+                                     public content::WebContentsObserver,
                                      public base::SupportsUserData::Data {
  public:
   ~ContentAutofillDriverFactory() override;
 
   static void CreateForWebContentsAndDelegate(
       content::WebContents* contents,
       AutofillClient* client,
       const std::string& app_locale,
       AutofillManager::AutofillDownloadManagerState enable_download_manager);
   static ContentAutofillDriverFactory* FromWebContents(
       content::WebContents* contents);
   static void BindAutofillDriver(content::RenderFrameHost* render_frame_host,
                                  mojom::AutofillDriverRequest request);
 
   // Gets the |ContentAutofillDriver| associated with |render_frame_host|.
   // |render_frame_host| must be owned by |web_contents()|.
   ContentAutofillDriver* DriverForFrame(
       content::RenderFrameHost* render_frame_host);
 
   // content::WebContentsObserver:
   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
   void WasHidden() override;
 
   static const char kContentAutofillDriverFactoryWebContentsUserDataKey[];
 
- protected:
+ private:
   ContentAutofillDriverFactory(
       content::WebContents* web_contents,
       AutofillClient* client,
       const std::string& app_locale,
       AutofillManager::AutofillDownloadManagerState enable_download_manager);
 
- private:
-  AutofillClient* client_;
   std::string app_locale_;
   AutofillManager::AutofillDownloadManagerState enable_download_manager_;
-
-  std::map<content::RenderFrameHost*, std::unique_ptr<ContentAutofillDriver>>
-      frame_driver_map_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_CONTENT_AUTOFILL_DRIVER_FACTORY_H_