Passing local_state to ProxyConfigMonitor

SystemNetworkContextManager already takes a PrefService in its ctor.
As a memeber variable of SystemNetworkContextManager, ProxyConfigMonitor
should do the same.
This CL also fixes an issue that ProxyServiceFactory is using
BrowserThread::UI to create the system proxy service. It is possible
that BrowserThread is not created if ServiceManager is started alone.
Switching to use base::ThreadTaskRunnerHandle::Get() instead.

BUG=866028

Change-Id: I6a33310e94a6050ca0bd22bdd716660aea790b58
Reviewed-on: https://chromium-review.googlesource.com/1255144Reviewed-by: Min Qin <qinmin@chromium.org>
Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595594}

chrome/browser/net/proxy_config_monitor.cc

@@ -21,6 +21,8 @@
 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
 #endif
 
+using content::BrowserThread;
+
 ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(profile);
@@ -51,12 +53,13 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
   proxy_config_service_->AddObserver(this);
 }
 
-ProxyConfigMonitor::ProxyConfigMonitor() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+         !BrowserThread::IsThreadInitialized(BrowserThread::UI));
 
   pref_proxy_config_tracker_.reset(
       ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
-          g_browser_process->local_state()));
+          local_state));
 
   proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService(
       pref_proxy_config_tracker_.get());
@@ -65,7 +68,8 @@ ProxyConfigMonitor::ProxyConfigMonitor() {
 }
 
 ProxyConfigMonitor::~ProxyConfigMonitor() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+         !BrowserThread::IsThreadInitialized(BrowserThread::UI));
   proxy_config_service_->RemoveObserver(this);
   pref_proxy_config_tracker_->DetachFromPrefService();
 }
@@ -100,7 +104,8 @@ void ProxyConfigMonitor::FlushForTesting() {
 void ProxyConfigMonitor::OnProxyConfigChanged(
     const net::ProxyConfigWithAnnotation& config,
     net::ProxyConfigService::ConfigAvailability availability) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+         !BrowserThread::IsThreadInitialized(BrowserThread::UI));
   proxy_config_client_set_.ForAllPtrs(
       [config,
        availability](network::mojom::ProxyConfigClient* proxy_config_client) {
@@ -134,7 +139,8 @@ void ProxyConfigMonitor::OnPACScriptError(int32_t line_number,
 
 void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
     int32_t net_error) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+         !BrowserThread::IsThreadInitialized(BrowserThread::UI));
 
   if (net_error >= 0) {
     // If the error is obviously wrong, don't dispatch it to extensions. If the

chrome/browser/net/proxy_config_monitor.h

@@ -22,6 +22,7 @@ class ProxyConfigWithAnnotation;
 
 class Profile;
 class PrefProxyConfigTracker;
+class PrefService;
 
 // Tracks the ProxyConfig to use, and passes any updates to a NetworkContext's
 // ProxyConfigClient. This also responds to errors related to proxy settings
@@ -42,10 +43,9 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
   explicit ProxyConfigMonitor(Profile* profile);
 
   // Creates a ProxyConfigMonitor that gets proxy settings from the
-  // BrowserProcess's |local_state_|, for use with NetworkContexts not
-  // assocaited with a profile. Must be destroyed before the BrowserProcess's
-  // |local_state_|.
-  ProxyConfigMonitor();
+  // |local_state|, for use with NetworkContexts not
+  // associated with a profile. Must be destroyed before |local_state|.
+  explicit ProxyConfigMonitor(PrefService* local_state);
 
   ~ProxyConfigMonitor() override;
 

chrome/browser/net/proxy_service_factory.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/net/proxy_service_factory.h"
 
 #include "base/task/post_task.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -22,8 +23,10 @@ using content::BrowserThread;
 std::unique_ptr<net::ProxyConfigService>
 ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) {
   // The linux gsettings-based proxy settings getter relies on being initialized
-  // from the UI thread.
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  // from the UI thread. The system proxy config service could also get created
+  // without full browser process by launching service manager alone.
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+         !BrowserThread::IsThreadInitialized(BrowserThread::UI));
 
   std::unique_ptr<net::ProxyConfigService> base_service;
 
@@ -37,7 +40,7 @@ ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) {
   // include command line and configuration policy).
 
   base_service = net::ProxyResolutionService::CreateSystemProxyConfigService(
-      base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI}));
+      base::ThreadTaskRunnerHandle::Get());
 #endif  // !defined(OS_CHROMEOS)
 
   return tracker->CreateTrackingProxyConfigService(std::move(base_service));

chrome/browser/net/system_network_context_manager.cc

@@ -346,7 +346,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
     PrefService* local_state)
     : local_state_(local_state),
       ssl_config_service_manager_(
-          SSLConfigServiceManager::CreateDefaultManager(local_state_)) {
+          SSLConfigServiceManager::CreateDefaultManager(local_state_)),
+      proxy_config_monitor_(local_state_) {
 #if !defined(OS_ANDROID)
   // QuicAllowed was not part of Android policy.
   const base::Value* value =
@@ -682,7 +683,8 @@ SystemNetworkContextManager::CreateNetworkContextParams() {
 
   network_context_params->primary_network_context = true;
 
-  proxy_config_monitor_.AddToNetworkContextParams(network_context_params.get());
+  proxy_config_monitor_.AddToNetworkContextParams(
+      network_context_params.get());
 
   return network_context_params;
 }

chrome/browser/safe_browsing/safe_browsing_service.cc

@@ -544,8 +544,10 @@ network::mojom::NetworkContextParamsPtr
 SafeBrowsingService::CreateNetworkContextParams() {
   auto params = g_browser_process->system_network_context_manager()
                     ->CreateDefaultNetworkContextParams();
-  if (!proxy_config_monitor_)
-    proxy_config_monitor_ = std::make_unique<ProxyConfigMonitor>();
+  if (!proxy_config_monitor_) {
+    proxy_config_monitor_ =
+        std::make_unique<ProxyConfigMonitor>(g_browser_process->local_state());
+  }
   proxy_config_monitor_->AddToNetworkContextParams(params.get());
   return params;
 }