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

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

Issue 1345523005: Added command line flag to override list of proxies from Data Saver API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased on master Created 5 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/core/browser/data_reduction_proxy_mutable_config_values.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.cc
index 5ba7a4f574b9a5b6c5c66804be7739d2d23c3f96..3699d4e7f355b27d377f92a073641c4d020e0a30 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.cc
@@ -4,6 +4,8 @@
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h"
+#include <vector>
+
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
namespace data_reduction_proxy {
@@ -25,7 +27,12 @@ DataReductionProxyMutableConfigValues::DataReductionProxyMutableConfigValues()
: promo_allowed_(false),
holdback_(false),
allowed_(false),
- fallback_allowed_(false) {
+ fallback_allowed_(false),
+ use_override_proxies_for_http_(false) {
+ use_override_proxies_for_http_ =
+ params::GetOverrideProxiesForHttpFromCommandLine(
+ &override_proxies_for_http_);
+
// Constructed on the UI thread, but should be checked on the IO thread.
thread_checker_.DetachFromThread();
}
@@ -58,6 +65,16 @@ bool DataReductionProxyMutableConfigValues::UsingHTTPTunnel(
const std::vector<net::ProxyServer>&
DataReductionProxyMutableConfigValues::proxies_for_http() const {
DCHECK(thread_checker_.CalledOnValidThread());
+ if (use_override_proxies_for_http_ && !proxies_for_http_.empty()) {
+ // Only override the proxies if a non-empty list of proxies would have been
+ // returned otherwise. This is to prevent use of the proxies when the config
+ // has been invalidated, since attempting to use a Data Reduction Proxy
+ // without valid credentials could cause a proxy bypass.
+ return override_proxies_for_http_;
+ }
+ // TODO(sclittle): Support overriding individual proxies in the proxy list
+ // according to field trials such as the DRP QUIC field trial and their
+ // corresponding command line flags (crbug.com/533637).
return proxies_for_http_;
}

Powered by Google App Engine
This is Rietveld 408576698