Use data reduction proxy when managed proxy config returns direct

chrome/browser/profiles/profile_impl_io_data.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_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 135 matching lines @@
       int media_cache_max_size,
       const base::FilePath& extensions_cookie_path,
       const base::FilePath& profile_path,
       const base::FilePath& infinite_cache_path,
       chrome_browser_net::Predictor* predictor,
       content::CookieStoreConfig::SessionCookieMode session_cookie_mode,
       quota::SpecialStoragePolicy* special_storage_policy,
       scoped_ptr<domain_reliability::DomainReliabilityMonitor>
           domain_reliability_monitor,
       const base::Callback<void(bool)>& data_reduction_proxy_unavailable,
+      const base::Callback<void(net::ProxyConfig*)>& proxy_config_getter,
       scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
           data_reduction_proxy_params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_);
   DCHECK(predictor);
 
   LazyParams* lazy_params = new LazyParams();
 
   lazy_params->cookie_path = cookie_path;
   lazy_params->channel_id_path = channel_id_path;
@@ skipping 15 matching lines @@
   io_data_->app_media_cache_max_size_ = media_cache_max_size;
 
   io_data_->predictor_.reset(predictor);
   io_data_->domain_reliability_monitor_ = domain_reliability_monitor.Pass();
 
   io_data_->InitializeMetricsEnabledStateOnUIThread();
 
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
   io_data_->data_reduction_proxy_unavailable_callback_ =
       data_reduction_proxy_unavailable;
+  io_data_->proxy_config_getter_ = proxy_config_getter;
   io_data_->data_reduction_proxy_params_ =
       data_reduction_proxy_params.Pass();
 #endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 }
 
 content::ResourceContext*
     ProfileImplIOData::Handle::GetResourceContext() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   return GetResourceContextNoInit();
@@ skipping 227 matching lines @@
 
 
   network_delegate()->set_data_reduction_proxy_params(
       data_reduction_proxy_params_.get());
   network_delegate()->set_data_reduction_proxy_usage_stats(
       data_reduction_proxy_usage_stats_.get());
   network_delegate()->set_data_reduction_proxy_auth_request_handler(
       data_reduction_proxy_auth_request_handler_.get());
   network_delegate()->set_on_resolve_proxy_handler(
       base::Bind(data_reduction_proxy::OnResolveProxyHandler));
+  network_delegate()->set_proxy_config_getter(proxy_config_getter_);
 #endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 
   network_delegate()->set_predictor(predictor_.get());
 
   // Initialize context members.
 
   ApplyProfileParamsToContext(main_context);
 
   if (http_server_properties_manager_)
     http_server_properties_manager_->InitializeOnNetworkThread();
@@ skipping 369 matching lines @@
     const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(initialized());
 
   DCHECK(transport_security_state());
   // Completes synchronously.
   transport_security_state()->DeleteAllDynamicDataSince(time);
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }