Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/autocomplete_history_manager.h

Index: components/autofill/core/browser/autocomplete_history_manager.h
diff --git a/components/autofill/core/browser/autocomplete_history_manager.h b/components/autofill/core/browser/autocomplete_history_manager.h
index 15c2ac625a505c68ecfc2b9b9c2d271fb5b4ba98..b4e97217c054b01d06f5bedd4da06842c18685dd 100644
--- a/components/autofill/core/browser/autocomplete_history_manager.h
+++ b/components/autofill/core/browser/autocomplete_history_manager.h
@@ -12,11 +12,6 @@
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
-namespace content {
-class BrowserContext;
-class WebContents;
-}
-
 namespace autofill {
 
 class AutofillDriver;
@@ -70,10 +65,9 @@ class AutocompleteHistoryManager : public WebDataServiceConsumer {
   // Cancels the currently pending WebDataService query, if there is one.
   void CancelPendingQuery();
 
-  content::BrowserContext* browser_context_;
   // Provides driver-level context. Must outlive this object.
   AutofillDriver* driver_;
-  scoped_refptr<AutofillWebDataService> autofill_data_;
+  scoped_refptr<AutofillWebDataService> database_;
 
   // When the manager makes a request from WebDataServiceBase, the database is
   // queried on another thread, we record the query handle until we get called