Split non-//content parts from ContentAutofillDriverFactory

components/autofill/content/browser/content_autofill_driver_factory.h

Index: components/autofill/content/browser/content_autofill_driver_factory.h
diff --git a/components/autofill/content/browser/content_autofill_driver_factory.h b/components/autofill/content/browser/content_autofill_driver_factory.h
index 63e168f60278cadd1c30b97a1158a7ada6fb5847..df2d8bcaf66de4d6382f9627922f7006caa67d49 100644
--- a/components/autofill/content/browser/content_autofill_driver_factory.h
+++ b/components/autofill/content/browser/content_autofill_driver_factory.h
@@ -5,12 +5,11 @@
 #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"
 
@@ -24,7 +23,8 @@ 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;
@@ -53,20 +53,15 @@ class ContentAutofillDriverFactory : public content::WebContentsObserver,
 
   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