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

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc

Issue 1124073008: Base Data Reduction Proxy configuration on vectors of servers per origin scheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bengr CR comments Created 5 years, 7 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/core/browser/data_reduction_proxy_config_service_client.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc
index b80568202bb772887069c0822c874b0044323117..1f42bea6578476cbaede77fe964fe6e7057850a0 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc
@@ -305,14 +305,9 @@ bool DataReductionProxyConfigServiceClient::ParseAndApplyProxyConfig(
if (proxies.empty())
return false;
- net::ProxyServer origin = proxies[0];
- net::ProxyServer fallback_origin;
- if (proxies.size() > 1)
- fallback_origin = proxies[1];
-
if (!use_local_config_) {
request_options_->SetSecureSession(config.session_key());
- config_values_->UpdateValues(origin, fallback_origin);
+ config_values_->UpdateValues(proxies);
config_->ReloadConfig();
return true;
}
@@ -325,7 +320,7 @@ bool DataReductionProxyConfigServiceClient::ParseAndApplyProxyConfig(
}
request_options_->SetCredentials(session, credentials);
- config_values_->UpdateValues(origin, fallback_origin);
+ config_values_->UpdateValues(proxies);
config_->ReloadConfig();
return true;
}

Powered by Google App Engine
This is Rietveld 408576698