diff options
| author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 13:17:15 +0000 |
|---|---|---|
| committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 13:17:15 +0000 |
| commit | d8fc4720c06d9e57d5fd98d6d6b723fffddbe159 (patch) | |
| tree | 665d9568104f3bfe1330e7d7b567cbe8c5d003d3 /net/proxy/proxy_service.cc | |
| parent | a2d6ed8e40f2747490558f311c438fa0245d262a (diff) | |
| download | chromium_src-d8fc4720c06d9e57d5fd98d6d6b723fffddbe159.zip chromium_src-d8fc4720c06d9e57d5fd98d6d6b723fffddbe159.tar.gz chromium_src-d8fc4720c06d9e57d5fd98d6d6b723fffddbe159.tar.bz2 | |
Moved data reduction proxy bypass logic to a NetworkDelegate
BUG=367221
Review URL: https://codereview.chromium.org/286903018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
| -rw-r--r-- | net/proxy/proxy_service.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index b70ea2c..c5cd6ac 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -13,6 +13,8 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy.h" +#include "base/metrics/histogram.h" +#include "base/metrics/sparse_histogram.h" #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" @@ -45,11 +47,6 @@ #include "net/proxy/proxy_config_service_android.h" #endif -#if defined(SPDY_PROXY_AUTH_ORIGIN) -#include "base/metrics/histogram.h" -#include "base/metrics/sparse_histogram.h" -#endif - using base::TimeDelta; using base::TimeTicks; @@ -1428,7 +1425,6 @@ scoped_ptr<ProxyService::PacPollPolicy> return scoped_ptr<PacPollPolicy>(new DefaultPollPolicy()); } -#if defined(SPDY_PROXY_AUTH_ORIGIN) void ProxyService::RecordDataReductionProxyBypassInfo( bool is_primary, const ProxyServer& proxy_server, @@ -1464,7 +1460,6 @@ void ProxyService::RecordDataReductionProxyBypassOnNetworkError( "DataReductionProxy.BypassOnNetworkErrorFallback", std::abs(net_error)); } -#endif // defined(SPDY_PROXY_AUTH_ORIGIN) void ProxyService::OnProxyConfigChanged( const ProxyConfig& config, |