| 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 2c48e9d474cfd409f7a39b0a0759b3245e24949a..02a1cbf7b6cc1af23bb759ea2227f90ff744d9fb 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 {
|
| @@ -104,6 +107,24 @@ bool DataReductionProxyParams::IsLoFiEnabled() {
|
| data_reduction_proxy::switches::kEnableDataReductionProxyLoFi);
|
| }
|
|
|
| +// static
|
| +bool DataReductionProxyParams::IsIncludedInQuicFieldTrial() {
|
| + return FieldTrialList::FindFullName(kQuicFieldTrial) == kEnabled;
|
| +}
|
| +
|
| +// static
|
| +std::string DataReductionProxyParams::GetQuicFieldTrialName() {
|
| + return kQuicFieldTrial;
|
| +}
|
| +
|
| +void DataReductionProxyParams::EnableQuic(bool enable) {
|
| + quic_enabled_ = enable;
|
| + DCHECK(!quic_enabled_ || IsIncludedInQuicFieldTrial());
|
| + if (command_line_origin_.empty() && quic_enabled_)
|
| + origin_ = net::ProxyServer::FromURI(kDefaultQuicOrigin,
|
| + net::ProxyServer::SCHEME_HTTP);
|
| +}
|
| +
|
| DataReductionProxyTypeInfo::DataReductionProxyTypeInfo()
|
| : proxy_servers(),
|
| is_fallback(false),
|
| @@ -298,6 +319,7 @@ void DataReductionProxyParams::InitWithoutChecks() {
|
| // command line.
|
| if (origin.empty())
|
| origin = GetDefaultDevOrigin();
|
| + command_line_origin_ = origin;
|
| if (origin.empty())
|
| origin = GetDefaultOrigin();
|
| if (fallback_origin.empty())
|
| @@ -526,7 +548,8 @@ bool DataReductionProxyParams::IsProxyBypassed(
|
|
|
| // TODO(kundaji): Remove tests for macro definitions.
|
| std::string DataReductionProxyParams::GetDefaultOrigin() const {
|
| - return kDefaultOrigin;
|
| + return quic_enabled_ ?
|
| + kDefaultQuicOrigin : kDefaultSpdyOrigin;
|
| }
|
|
|
| std::string DataReductionProxyParams::GetDefaultFallbackOrigin() const {
|
|
|