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 4f0ca9a060c10bd51ab4567e1bbf06e50d52d701..a5d015e7ab9372a2cf22999fe8da9be8f5fca7e9 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 |
@@ -30,7 +30,8 @@ using base::FieldTrialList; |
namespace { |
const char kEnabled[] = "Enabled"; |
-const char kDefaultOrigin[] = "https://proxy.googlezip.net:443"; |
+const char kDefaultSpdyOrigin[] = "https://proxy.googlezip.net:443"; |
+const char kDefaultQuicOrigin[] = "quic://proxy.googlezip.net:443"; |
const char kDevOrigin[] = "https://proxy-dev.googlezip.net:443"; |
const char kDevFallbackOrigin[] = "proxy-dev.googlezip.net:80"; |
const char kDefaultFallbackOrigin[] = "compress.googlezip.net:80"; |
@@ -44,6 +45,8 @@ const char kDefaultProbeUrl[] = "http://check.googlezip.net/connect"; |
const char kDefaultWarmupUrl[] = "http://www.gstatic.com/generate_204"; |
const char kAndroidOneIdentifier[] = "sprout"; |
+ |
+const char kQuicFieldTrial[] = "DataReductionProxyUseQuic"; |
} // namespace |
namespace data_reduction_proxy { |
@@ -98,6 +101,24 @@ bool DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial( |
return (fingerprint.find(kAndroidOneIdentifier) != std::string::npos); |
} |
+// static |
+bool DataReductionProxyParams::IsIncludedInQuicFieldTrial() { |
+ return FieldTrialList::FindFullName(kQuicFieldTrial) == kEnabled; |
+} |
+ |
+// static |
+std::string DataReductionProxyParams::GetQuicFieldTrialName() { |
+ return kQuicFieldTrial; |
+} |
+ |
+void DataReductionProxyParams::EnableQuic(bool enable) { |
+ quic_enabled_ = enable; |
+ if (command_line_origin_.empty() && IsIncludedInQuicFieldTrial() && |
bengr
2015/02/12 17:14:46
I thought I commented on this but maybe I didn't.
tbansal1
2015/02/13 17:10:40
Done.
|
+ quic_enabled_) |
+ origin_ = net::ProxyServer::FromURI(kDefaultQuicOrigin, |
+ net::ProxyServer::SCHEME_HTTP); |
+} |
+ |
DataReductionProxyTypeInfo::DataReductionProxyTypeInfo() |
: proxy_servers(), |
is_fallback(false), |
@@ -292,6 +313,7 @@ void DataReductionProxyParams::InitWithoutChecks() { |
// command line. |
if (origin.empty()) |
origin = GetDefaultDevOrigin(); |
+ command_line_origin_ = origin; |
if (origin.empty()) |
origin = GetDefaultOrigin(); |
if (fallback_origin.empty()) |
@@ -520,7 +542,8 @@ bool DataReductionProxyParams::IsProxyBypassed( |
// TODO(kundaji): Remove tests for macro definitions. |
std::string DataReductionProxyParams::GetDefaultOrigin() const { |
- return kDefaultOrigin; |
+ return IsIncludedInQuicFieldTrial() && quic_enabled_ ? |
bengr
2015/02/12 17:14:46
Likewise here, the quic origin should be return un
tbansal1
2015/02/13 17:10:40
Done.
|
+ kDefaultQuicOrigin : kDefaultSpdyOrigin; |
} |
std::string DataReductionProxyParams::GetDefaultFallbackOrigin() const { |