Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/autofill_manager_delegate.h

 // Copyright 2013 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_CORE_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
 
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 
 namespace gfx {
 class Rect;
 class RectF;
 }
 
 class GURL;
 class InfoBarService;
 class PrefService;
 
 namespace autofill {
 
 class AutofillMetrics;
 class AutofillPopupDelegate;
+class AutofillWebDataService;
 class CreditCard;
 class FormStructure;
 class PasswordGenerator;
 class PersonalDataManager;
 struct FormData;
 struct PasswordForm;
 
 // A delegate interface that needs to be supplied to AutofillManager
 // by the embedder.
 //
 // Each delegate instance is associated with a given context within
 // which an AutofillManager is used (e.g. a single tab), so when we
 // say "for the delegate" below, we mean "in the execution context the
 // delegate is associated with" (e.g. for the tab the AutofillManager is
 // attached to).
 class AutofillManagerDelegate {
  public:
   virtual ~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>
+      GetDatabase() = 0;

[Ilya Sherman, 2013/11/14 23:45:55]

nit: Looks like this ought to fit on a single line now.

[blundell, 2013/11/15 16:04:54]

Done.

+
   // Gets the preferences associated with the delegate.
   virtual PrefService* GetPrefs() = 0;
 
   // Hides the associated request autocomplete dialog (if it exists).
   virtual void HideRequestAutocompleteDialog() = 0;
 
   // Causes the Autofill settings UI to be shown.
   virtual void ShowAutofillSettings() = 0;
 
   // Run |save_card_callback| if the credit card should be imported as personal
@@ skipping 33 matching lines @@
 
   // Pass the form structures to the password generation manager to detect
   // account creation forms.
   virtual void DetectAccountCreationForms(
       const std::vector<autofill::FormStructure*>& forms) = 0;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_