Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/personal_data_manager.h

Index: components/autofill/core/browser/personal_data_manager.h
diff --git a/components/autofill/core/browser/personal_data_manager.h b/components/autofill/core/browser/personal_data_manager.h
index 9926016bdaaf003b057c3bdc18b91f4778671264..b6c6ca06df6e0c7a14d962629c3a8354825f34ef 100644
--- a/components/autofill/core/browser/personal_data_manager.h
+++ b/components/autofill/core/browser/personal_data_manager.h
@@ -22,14 +22,11 @@
 class PrefService;
 class RemoveAutofillTester;
 
-namespace content {
-class BrowserContext;
-}
-
 namespace autofill {
 class AutofillInteractiveTest;
 class AutofillMetrics;
 class AutofillTest;
+class AutofillWebDataService;
 class FormStructure;
 class PersonalDataManagerObserver;
 class PersonalDataManagerFactory;
@@ -55,11 +52,11 @@ class PersonalDataManager : public WebDataServiceConsumer,
   explicit PersonalDataManager(const std::string& app_locale);
   virtual ~PersonalDataManager();
 
-  // Kicks off asynchronous loading of profiles and credit cards. |context| and
-  // |pref_service| must outlive this instance. |is_off_the_record| informs
-  // this instance whether the user is currently operating in an off-the-record
-  // context.
-  void Init(content::BrowserContext* context,
+  // Kicks off asynchronous loading of profiles and credit cards.
+  // |autofill_webdata| and |pref_service| must outlive this instance.
+  // |is_off_the_record| informs this instance whether the user is currently
+  // operating in an off-the-record context.
+  void Init(scoped_refptr<AutofillWebDataService> autofill_webdata,
             PrefService* pref_service,
             bool is_off_the_record);
 
@@ -260,12 +257,13 @@ class PersonalDataManager : public WebDataServiceConsumer,
 
   // For tests.
   const AutofillMetrics* metric_logger() const;
+  void set_autofill_webdata_service(
+      scoped_refptr<AutofillWebDataService> webdata);

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

nit: This ought to be inlined.

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

nit: You're using three different names here: "autofill_webdata_service" as the
method name, "autofill_webdata" as the instance variable name, and "webdata" as
the parameter name.  Please pick a single name and use it throughout :)

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

Done.

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

Done.

   void set_metric_logger(const AutofillMetrics* metric_logger);
-  void set_browser_context(content::BrowserContext* context);
   void set_pref_service(PrefService* pref_service);
 
-  // The browser context this PersonalDataManager is in.
-  content::BrowserContext* browser_context_;
+  // The AutofillWebDataService that this PersonalDataManager uses.

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

nit: Might be more useful to document as the backing database that the
PersonalDataManager uses.

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

Done.

+  scoped_refptr<AutofillWebDataService> autofill_webdata_;

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

nit: The "autofill_" prefix seems quite redundant here.  Perhaps this ought to
be named something like "web_data_service_" or even more simply as "database_"?

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

Done.

 
   // True if personal data has been loaded from the web database.
   bool is_data_loaded_;