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

Unified Diff: components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc

Issue 1871783002: Remove the Data Reduction Proxy TLS experiment code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/common/data_reduction_proxy_params.cc
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
index 1f7ca438783bcde76b6a6e4b21dada5d5273f24c..1a0ff446584086ff3d5d9ad5b6f1e850990339e2 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
@@ -15,7 +15,6 @@
#include "base/strings/string_util.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
#include "components/variations/variations_associated_data.h"
-#include "net/base/host_port_pair.h"
#include "net/proxy/proxy_server.h"
#include "url/url_constants.h"
@@ -303,9 +302,7 @@ void DataReductionProxyParams::EnableQuic(bool enable) {
}
}
-DataReductionProxyTypeInfo::DataReductionProxyTypeInfo()
- : is_fallback(false), is_ssl(false) {
-}
+DataReductionProxyTypeInfo::DataReductionProxyTypeInfo() : is_fallback(false) {}
DataReductionProxyTypeInfo::DataReductionProxyTypeInfo(
const DataReductionProxyTypeInfo& other) = default;
@@ -381,11 +378,8 @@ void DataReductionProxyParams::InitWithoutChecks() {
origin = command_line.GetSwitchValueASCII(switches::kDataReductionProxy);
std::string fallback_origin =
command_line.GetSwitchValueASCII(switches::kDataReductionProxyFallback);
- std::string ssl_origin =
- command_line.GetSwitchValueASCII(switches::kDataReductionSSLProxy);
- configured_on_command_line_ =
- !(origin.empty() && fallback_origin.empty() && ssl_origin.empty());
+ configured_on_command_line_ = !(origin.empty() && fallback_origin.empty());
// Configuring the proxy on the command line overrides the values of
// |allowed_|.
@@ -404,8 +398,6 @@ void DataReductionProxyParams::InitWithoutChecks() {
origin = GetDefaultOrigin();
if (fallback_origin.empty())
fallback_origin = GetDefaultFallbackOrigin();
- if (ssl_origin.empty())
- ssl_origin = GetDefaultSSLOrigin();
if (secure_proxy_check_url.empty())
secure_proxy_check_url = GetDefaultSecureProxyCheckURL();
if (warmup_url.empty())
@@ -414,25 +406,15 @@ void DataReductionProxyParams::InitWithoutChecks() {
origin_ = net::ProxyServer::FromURI(origin, net::ProxyServer::SCHEME_HTTP);
fallback_origin_ =
net::ProxyServer::FromURI(fallback_origin, net::ProxyServer::SCHEME_HTTP);
- ssl_origin_ =
- net::ProxyServer::FromURI(ssl_origin, net::ProxyServer::SCHEME_HTTP);
if (origin_.is_valid())
proxies_for_http_.push_back(origin_);
if (fallback_allowed_ && fallback_origin_.is_valid())
proxies_for_http_.push_back(fallback_origin_);
- if (ssl_origin_.is_valid())
- proxies_for_https_.push_back(ssl_origin_);
secure_proxy_check_url_ = GURL(secure_proxy_check_url);
warmup_url_ = GURL(warmup_url);
}
-bool DataReductionProxyParams::UsingHTTPTunnel(
- const net::HostPortPair& proxy_server) const {
- return ssl_origin_.is_valid() &&
- ssl_origin_.host_port_pair().Equals(proxy_server);
-}
-
const std::vector<net::ProxyServer>&
DataReductionProxyParams::proxies_for_http() const {
if (use_override_proxies_for_http_)
@@ -440,11 +422,6 @@ DataReductionProxyParams::proxies_for_http() const {
return proxies_for_http_;
}
-const std::vector<net::ProxyServer>&
-DataReductionProxyParams::proxies_for_https() const {
- return proxies_for_https_;
-}
-
// Returns the URL to check to decide if the secure proxy origin should be
// used.
const GURL& DataReductionProxyParams::secure_proxy_check_url() const {
@@ -488,10 +465,6 @@ std::string DataReductionProxyParams::GetDefaultFallbackOrigin() const {
return kDefaultFallbackOrigin;
}
-std::string DataReductionProxyParams::GetDefaultSSLOrigin() const {
- return std::string();
-}
-
std::string DataReductionProxyParams::GetDefaultSecureProxyCheckURL() const {
return kDefaultSecureProxyCheckUrl;
}

Powered by Google App Engine
This is Rietveld 408576698