Parameterize the PrefService that PersonalDataManager uses.

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;
@@ skipping 16 matching lines @@
                             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.
-  void Init(content::BrowserContext* context);
+  void Init(content::BrowserContext* context, PrefService* pref_service);
 
   // WebDataServiceConsumer:
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
   // AutofillWebDataServiceObserverOnUIThread:
   virtual void AutofillMultipleChanged() OVERRIDE;
 
   // Adds a listener to be notified of PersonalDataManager events.
@@ skipping 223 matching lines @@
   std::string MostCommonCountryCodeFromProfiles() const;
 
   const std::string app_locale_;
 
   // The default country code for new addresses.
   mutable std::string default_country_code_;
 
   // For logging UMA metrics. Overridden by metrics tests.
   scoped_ptr<const AutofillMetrics> metric_logger_;
 
+  // The PrefService that this class uses.

[Jói, 2013/10/31 17:23:05]

Document the lifetime guarantees. I'm guessing in this case it's guaranteed by
the caller to exceed the lifetime of this object... in which case that should be
documented on the constructor where the pointer is passed in.

[blundell, 2013/11/03 21:33:03]

Done.

+  PrefService* pref_service_;
+
   // 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_