Enable QUIC for proxies based on Finch config and command line switch.

components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "url/url_constants.h"
 
 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";
 // This is for a proxy that supports HTTP CONNECT to tunnel SSL traffic.
 // The proxy listens on port 443, but uses the HTTP protocol to set up
 // the tunnel, not HTTPS.
 const char kDefaultSslOrigin[] = "ssl.googlezip.net:443";
 const char kDefaultAltOrigin[] = "ssl.googlezip.net:80";
 const char kDefaultAltFallbackOrigin[] = "ssl.googlezip.net:80";
 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 {
 
 // static
 bool DataReductionProxyParams::IsIncludedInAlternativeFieldTrial() {
   const std::string group_name = base::FieldTrialList::FindFullName(
       "DataCompressionProxyAlternativeConfiguration");
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           data_reduction_proxy::switches::kEnableDataReductionProxyAlt)) {
@@ skipping 34 matching lines @@
       "DataReductionProxyRemoveMissingViaHeaderOtherBypass") == "Relaxed";
 }
 
 // static
 bool DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial(
     const char* build_fingerprint) {
   base::StringPiece fingerprint(build_fingerprint);
   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. I don't think that we should
guard this with a check that we're in the field trial. That's for the caller to
determine.

[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),
       is_alternative(false),
       is_ssl(false) {
 }
 
 DataReductionProxyTypeInfo::~DataReductionProxyTypeInfo(){
 }
 
@@ skipping 174 matching lines @@
 
   std::string probe_url = command_line.GetSwitchValueASCII(
       switches::kDataReductionProxyProbeURL);
   std::string warmup_url = command_line.GetSwitchValueASCII(
       switches::kDataReductionProxyWarmupURL);
 
   // Set from preprocessor constants those params that are not specified on the
   // command line.
   if (origin.empty())
     origin = GetDefaultDevOrigin();
+  command_line_origin_ = origin;
   if (origin.empty())
     origin = GetDefaultOrigin();
   if (fallback_origin.empty())
     fallback_origin = GetDefaultDevFallbackOrigin();
   if (fallback_origin.empty())
     fallback_origin = GetDefaultFallbackOrigin();
   if (ssl_origin.empty())
     ssl_origin = GetDefaultSSLOrigin();
   if (alt_origin.empty())
     alt_origin = GetDefaultAltOrigin();
@@ skipping 208 matching lines @@
   }
 
   if (retry_delay)
      *retry_delay = found->second.current_delay;
 
   return true;
 }
 
 // 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 unconditionally if
quic_enabled_.

[tbansal1, 2015/02/13 17:10:40]

Done.

+      kDefaultQuicOrigin : kDefaultSpdyOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultFallbackOrigin() const {
   return kDefaultFallbackOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultSSLOrigin() const {
   return kDefaultSslOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultAltOrigin() const {
   return kDefaultAltOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultAltFallbackOrigin() const {
   return kDefaultAltFallbackOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultProbeURL() const {
   return kDefaultProbeUrl;
 }
 
 std::string DataReductionProxyParams::GetDefaultWarmupURL() const {
   return kDefaultWarmupUrl;
 }
 
 }  // namespace data_reduction_proxy