Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/personal_data_manager.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_PERSONAL_DATA_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.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_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 AutofillWebDataService;
 class FormStructure;
 class PersonalDataManagerObserver;
 class PersonalDataManagerFactory;
 }  // namespace autofill
 
 namespace autofill_helper {
 void SetProfiles(int, std::vector<autofill::AutofillProfile>*);
 void SetCreditCards(int, std::vector<autofill::CreditCard>*);
 }  // namespace autofill_helper
 
 namespace autofill {
 
 // Handles loading and saving Autofill profile information to the web database.
 // This class also stores the profiles loaded from the database for use during
 // Autofill.
 class PersonalDataManager : public WebDataServiceConsumer,
                             public AutofillWebDataServiceObserverOnUIThread {
  public:
   // A pair of GUID and variant index. Represents a single FormGroup and a
   // specific data variant.
   typedef std::pair<std::string, size_t> GUIDPair;
 
   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);
 
   // WebDataServiceConsumer:
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
   // AutofillWebDataServiceObserverOnUIThread:
   virtual void AutofillMultipleChanged() OVERRIDE;
@@ skipping 180 matching lines @@
 
   // The first time this is called, logs an UMA metrics for the number of
   // profiles the user has. On subsequent calls, does nothing.
   void LogProfileCount() const;
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
   // 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_;
 
   // The loaded web profiles.
   ScopedVector<AutofillProfile> web_profiles_;
 
   // Auxiliary profiles.
   mutable ScopedVector<AutofillProfile> auxiliary_profiles_;
 
@@ skipping 36 matching lines @@
 
   // Whether we have already logged the number of profiles this session.
   mutable bool has_logged_profile_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_