Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/autofill_manager_delegate.h

Index: components/autofill/core/browser/autofill_manager_delegate.h
diff --git a/components/autofill/core/browser/autofill_manager_delegate.h b/components/autofill/core/browser/autofill_manager_delegate.h
index 833f1b4600ed75516ea1c3beca21553b5a4f1126..822be91ce72571f5bb32de33c6dbe7b96849e254 100644
--- a/components/autofill/core/browser/autofill_manager_delegate.h
+++ b/components/autofill/core/browser/autofill_manager_delegate.h
@@ -25,6 +25,7 @@ namespace autofill {
 
 class AutofillMetrics;
 class AutofillPopupDelegate;
+class AutofillWebDataService;
 class CreditCard;
 class FormStructure;
 class PasswordGenerator;
@@ -47,6 +48,10 @@ class AutofillManagerDelegate {
   // Gets the PersonalDataManager instance associated with the delegate.
   virtual PersonalDataManager* GetPersonalDataManager() = 0;
 
+  // Gets the AutofillWebDataService instance associated with the delegate.
+  virtual scoped_refptr<AutofillWebDataService>
+      GetAutofillWebDataService() = 0;

[Ilya Sherman, 2013/11/14 02:22:02]

nit: What do you think of naming this just "GetDatabase()"?  As far as the
Autofill code is concerned, this class is the interface it uses for all DB
interactions.

[Jói, 2013/11/14 12:31:49]

+1

[blundell, 2013/11/14 16:46:30]

Much better, done.

On 2013/11/14 02:22:02, Ilya Sherman wrote:

+
   // Gets the preferences associated with the delegate.
   virtual PrefService* GetPrefs() = 0;