Allow injecting a PrefService into ChromeComponentUpdaterConfigurator.

chrome/browser/component_updater/chrome_component_updater_configurator.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/component_updater/chrome_component_updater_configurator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/sys_string_conversions.h"
@@ skipping 14 matching lines @@
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace component_updater {
 
 namespace {
 
 class ChromeConfigurator : public update_client::Configurator {
  public:
   ChromeConfigurator(const base::CommandLine* cmdline,
-                     net::URLRequestContextGetter* url_request_getter);
+                     net::URLRequestContextGetter* url_request_getter,
+                     PrefService* pref_service);
 
   // update_client::Configurator overrides.
   int InitialDelay() const override;
   int NextCheckDelay() const override;
   int StepDelay() const override;
   int OnDemandDelay() const override;
   int UpdateDelay() const override;
   std::vector<GURL> UpdateUrl() const override;
   std::vector<GURL> PingUrl() const override;
   base::Version GetBrowserVersion() const override;
@@ skipping 12 matching lines @@
   bool EnabledCupSigning() const override;
   scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
       const override;
   PrefService* GetPrefService() const override;
 
  private:
   friend class base::RefCountedThreadSafe<ChromeConfigurator>;
 
   ConfiguratorImpl configurator_impl_;
 
+  PrefService* pref_service_;  // This member is not owned by this class.
+
   ~ChromeConfigurator() override {}
 };
 
 // Allows the component updater to use non-encrypted communication with the
 // update backend. The security of the update checks is enforced using
 // a custom message signing protocol and it does not depend on using HTTPS.
 ChromeConfigurator::ChromeConfigurator(
     const base::CommandLine* cmdline,
-    net::URLRequestContextGetter* url_request_getter)
-    : configurator_impl_(cmdline, url_request_getter, false) {}
+    net::URLRequestContextGetter* url_request_getter,
+    PrefService* pref_service)
+    : configurator_impl_(cmdline, url_request_getter, false),
+      pref_service_(pref_service) {
+  DCHECK(pref_service_);
+}
 
 int ChromeConfigurator::InitialDelay() const {
   return configurator_impl_.InitialDelay();
 }
 
 int ChromeConfigurator::NextCheckDelay() const {
   return configurator_impl_.NextCheckDelay();
 }
 
 int ChromeConfigurator::StepDelay() const {
@@ skipping 86 matching lines @@
 // not accessing any global browser state while the code is running.
 scoped_refptr<base::SequencedTaskRunner>
 ChromeConfigurator::GetSequencedTaskRunner() const {
   return content::BrowserThread::GetBlockingPool()
       ->GetSequencedTaskRunnerWithShutdownBehavior(
           base::SequencedWorkerPool::GetSequenceToken(),
           base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
 }
 
 PrefService* ChromeConfigurator::GetPrefService() const {
-  return g_browser_process->local_state();
+  DCHECK(pref_service_);
+  return pref_service_;
 }
 
 }  // namespace
 
 scoped_refptr<update_client::Configurator>
 MakeChromeComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
-    net::URLRequestContextGetter* context_getter) {
-  return new ChromeConfigurator(cmdline, context_getter);
+    net::URLRequestContextGetter* context_getter,
+    PrefService* pref_service) {
+  return new ChromeConfigurator(cmdline, context_getter, pref_service);
 }
 
 }  // namespace component_updater