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..88130c1c1dbdfd5bde0db50c88b77f953d237add 100644
--- a/components/autofill/core/browser/personal_data_manager.h
+++ b/components/autofill/core/browser/personal_data_manager.h
@@ -12,23 +12,20 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"

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

These should remain as forward-declarations in the header file.

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

Done for PrefService. The other two changes are needed due to the
scoped_(ref)ptr operations now happening in the .h file.

On 2013/11/14 23:45:55, Ilya Sherman wrote:

 #include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
-class PrefService;
 class RemoveAutofillTester;
 
-namespace content {
-class BrowserContext;
-}
-
 namespace autofill {
 class AutofillInteractiveTest;
-class AutofillMetrics;
 class AutofillTest;
 class FormStructure;
 class PersonalDataManagerObserver;
@@ -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
+  // Kicks off asynchronous loading of profiles and credit cards.
+  // |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,
+  void Init(scoped_refptr<AutofillWebDataService> database,
             PrefService* pref_service,
             bool is_off_the_record);
 
@@ -259,13 +256,22 @@ class PersonalDataManager : public WebDataServiceConsumer,
   virtual bool IsAutofillEnabled() const;
 
   // For tests.
-  const AutofillMetrics* metric_logger() const;
-  void set_metric_logger(const AutofillMetrics* metric_logger);
-  void set_browser_context(content::BrowserContext* context);
-  void set_pref_service(PrefService* pref_service);
+  const AutofillMetrics* metric_logger() const { return metric_logger_.get(); }
+
+  void set_database(scoped_refptr<AutofillWebDataService> database) {
+    database_ = database;
+  }
+
+  void set_metric_logger(const AutofillMetrics* metric_logger) {
+    metric_logger_.reset(metric_logger);
+  }
+
+  void set_pref_service(PrefService* pref_service) {
+    pref_service_ = pref_service;
+  }
 
-  // The browser context this PersonalDataManager is in.
-  content::BrowserContext* browser_context_;
+  // The backing database that this PersonalDataManager uses.
+  scoped_refptr<AutofillWebDataService> database_;
 
   // True if personal data has been loaded from the web database.
   bool is_data_loaded_;