Use data reduction proxy when managed proxy config returns direct

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2012 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/profiles/profile_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 614 matching lines @@
   if (GetLastSessionExitType() == Profile::EXIT_CRASHED ||
       startup_pref_type == SessionStartupPref::LAST) {
     session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES;
   }
 
   InitHostZoomMap();
 
   base::Callback<void(bool)> data_reduction_proxy_unavailable;
   scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
       data_reduction_proxy_params;
+  base::Callback<const net::ProxyConfig&()> proxy_config_getter;
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
   DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings =
       DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this);
   data_reduction_proxy_params =
       data_reduction_proxy_chrome_settings->params()->Clone();
   data_reduction_proxy_unavailable =
       base::Bind(
           &data_reduction_proxy::DataReductionProxySettings::SetUnreachable,
           base::Unretained(data_reduction_proxy_chrome_settings));
+  DataReductionProxyChromeConfigurator* chrome_configurator =
+      new DataReductionProxyChromeConfigurator(
+          prefs_.get(),
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
+  scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
+      configurator(chrome_configurator);
+  proxy_config_getter = base::Bind(
+      &DataReductionProxyChromeConfigurator::GetProxyConfigOnIO,
+      base::Unretained(chrome_configurator));
 #endif
 
   // Make sure we initialize the ProfileIOData after everything else has been
   // initialized that we might be reading from the IO thread.
 
   io_data_.Init(cookie_path, channel_id_path, cache_path,
                 cache_max_size, media_cache_path, media_cache_max_size,
                 extensions_cookie_path, GetPath(), infinite_cache_path,
                 predictor_, session_cookie_mode, GetSpecialStoragePolicy(),
                 CreateDomainReliabilityMonitor(),
                 data_reduction_proxy_unavailable,
+                proxy_config_getter,
                 data_reduction_proxy_params.Pass());

[mmenke, 2014/08/12 20:15:53]

How is this safe?  Looks like the chrome_configurator may be destroyed on the UI
thread before the getter is called on the IO thread.

[bengr, 2014/08/13 01:31:28]

Done.

 
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
-  scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
-      configurator(new DataReductionProxyChromeConfigurator(prefs_.get()));
   data_reduction_proxy_chrome_settings->InitDataReductionProxySettings(
       configurator.Pass(),
       prefs_.get(),
       g_browser_process->local_state(),
       GetRequestContext());
 #endif
 
 #if defined(ENABLE_PLUGINS)
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
       PluginPrefs::GetForProfile(this).get(),
@@ skipping 731 matching lines @@
 ProfileImpl::CreateDomainReliabilityMonitor() {
   domain_reliability::DomainReliabilityService* service =
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 }