Make Data Reduction Proxy a best effort proxy

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 11 matching lines @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/chrome_sdch_policy.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/cookie_store_util.h"
 #include "chrome/browser/net/http_server_properties_manager_factory.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/quota_policy_channel_id_store.h"
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
 #include "components/domain_reliability/monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
@@ skipping 83 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,
     storage::SpecialStoragePolicy* special_storage_policy,
     scoped_ptr<domain_reliability::DomainReliabilityMonitor>
         domain_reliability_monitor,
     const base::Callback<void(bool)>& data_reduction_proxy_unavailable,
-    scoped_ptr<DataReductionProxyChromeConfigurator>
-        data_reduction_proxy_chrome_configurator,
+    scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
+        data_reduction_proxy_configurator,
     scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
         data_reduction_proxy_params,
     scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
         data_reduction_proxy_statistics_prefs,
     scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
         data_reduction_proxy_event_store) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_);
   DCHECK(predictor);
 
@@ skipping 20 matching lines @@
 
   io_data_->predictor_.reset(predictor);
   io_data_->domain_reliability_monitor_ = domain_reliability_monitor.Pass();
 
   io_data_->InitializeMetricsEnabledStateOnUIThread();
   if (io_data_->domain_reliability_monitor_)
     io_data_->domain_reliability_monitor_->MoveToNetworkThread();
 
   io_data_->set_data_reduction_proxy_unavailable_callback(
       data_reduction_proxy_unavailable);
-  io_data_->set_data_reduction_proxy_chrome_configurator(
-      data_reduction_proxy_chrome_configurator.Pass());
+  io_data_->set_data_reduction_proxy_configurator(
+      data_reduction_proxy_configurator.Pass());
   io_data_->set_data_reduction_proxy_params(data_reduction_proxy_params.Pass());
   io_data_->set_data_reduction_proxy_statistics_prefs(
       data_reduction_proxy_statistics_prefs.Pass());
   io_data_->set_data_reduction_proxy_event_store(
       data_reduction_proxy_event_store.Pass());
 }
 
 content::ResourceContext*
     ProfileImplIOData::Handle::GetResourceContext() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 282 matching lines @@
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "436671 ProfileImplIOData::InitializeInternal3"));
 
   scoped_ptr<data_reduction_proxy::DataReductionProxyNetworkDelegate>
   data_reduction_proxy_network_delegate(
       new data_reduction_proxy::DataReductionProxyNetworkDelegate(
           chrome_network_delegate.Pass(),
           data_reduction_proxy_params(),
           data_reduction_proxy_auth_request_handler(),
           base::Bind(
-              &DataReductionProxyChromeConfigurator::GetProxyConfigOnIOThread,
-              base::Unretained(data_reduction_proxy_chrome_configurator()))));
+              &data_reduction_proxy::DataReductionProxyConfigurator::
+                  GetProxyConfigOnIOThread,
+              base::Unretained(data_reduction_proxy_configurator()))));
   data_reduction_proxy_network_delegate->InitProxyConfigOverrider(
       base::Bind(data_reduction_proxy::OnResolveProxyHandler));
   data_reduction_proxy_network_delegate->InitStatisticsPrefsAndUMA(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
       data_reduction_proxy_statistics_prefs(),
       &data_reduction_proxy_enabled_,
       data_reduction_proxy_usage_stats());
   network_delegate_ = data_reduction_proxy_network_delegate.Pass();
 
   // Initialize context members.
@@ skipping 408 matching lines @@
   transport_security_state()->DeleteAllDynamicDataSince(time);
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }
 
 bool ProfileImplIOData::IsDataReductionProxyEnabled() const {
   return data_reduction_proxy_enabled_.GetValue() ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              data_reduction_proxy::switches::kEnableDataReductionProxy);
 }