Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc

Issue 548993002: Removed connection warmup logic from data reduction proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
index 09f5d2c43e7eccfa675c5a80a891d85f887d288c..a2ca75d1ee2d97a07e75f9fb23238e71f2f0cc8f 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
@@ -240,11 +240,6 @@ void DataReductionProxySettings::OnURLFetchComplete(
const net::URLFetcher* source) {
DCHECK(thread_checker_.CalledOnValidThread());
- // The purpose of sending a request for the warmup URL is to warm the
- // connection to the data_reduction_proxy. The result is ignored.
- if (source == warmup_fetcher_.get())
- return;
-
DCHECK(source == fetcher_.get());
net::URLRequestStatus status = source->GetStatus();
if (status.status() == net::URLRequestStatus::FAILED) {
@@ -351,7 +346,6 @@ void DataReductionProxySettings::OnIPAddressChanged() {
if (DisableIfVPN())
return;
ProbeWhetherDataReductionProxyIsAvailable();
- WarmProxyConnection();
}
}
@@ -407,7 +401,6 @@ void DataReductionProxySettings::MaybeActivateDataReductionProxy(
// Check if the proxy has been restricted explicitly by the carrier.
if (enabled_by_user_ && !disabled_on_vpn_) {
ProbeWhetherDataReductionProxyIsAvailable();
- WarmProxyConnection();
}
}
@@ -566,18 +559,6 @@ void DataReductionProxySettings::ProbeWhetherDataReductionProxyIsAvailable() {
fetcher_->Start();
}
-net::URLFetcher* DataReductionProxySettings::GetURLFetcherForWarmup() {
- return GetBaseURLFetcher(params_->warmup_url(), net::LOAD_DISABLE_CACHE);
-}
-
-void DataReductionProxySettings::WarmProxyConnection() {
- net::URLFetcher* fetcher = GetURLFetcherForWarmup();
- if (!fetcher)
- return;
- warmup_fetcher_.reset(fetcher);
- warmup_fetcher_->Start();
-}
-
bool DataReductionProxySettings::DisableIfVPN() {
net::NetworkInterfaceList network_interfaces;
GetNetworkList(&network_interfaces, 0);

Powered by Google App Engine
This is Rietveld 408576698