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";
@@ skipping 47 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::IsIncludedInUseQUICFieldTrial() {
+  return FieldTrialList::FindFullName("DataReductionProxyUseQuic") == kEnabled;
+}
+
+void DataReductionProxyParams::SetIsQuicEnabledForProxies(
+    bool quic_enabled_for_proxies) {
+  quic_enabled_for_proxies_ = quic_enabled_for_proxies;
+  if (command_line_origin_.empty() && IsIncludedInUseQUICFieldTrial() &&

[bengr, 2015/02/10 20:18:31]

I don't think you want to check if you're in the field trial here, since that's
already done from the code in IOThread.

[tbansal1, 2015/02/10 22:24:38]

I need to: quic_enabled_for_proxies_ can be true if either is true (i)
enable_quic is true OR (ii) chrome is part of DRP QUIC field trial.  If
enable_quic is true (may be because of QUIC field trial), we need to check for
DRP QUIC field trial.

+      quic_enabled_for_proxies_)
+    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 156 matching lines @@
       command_line.GetSwitchValueASCII(switches::kDataReductionSSLProxy);
   std::string alt_origin =
       command_line.GetSwitchValueASCII(switches::kDataReductionProxyAlt);
   std::string alt_fallback_origin = command_line.GetSwitchValueASCII(
       switches::kDataReductionProxyAltFallback);
 
   configured_on_command_line_ =
       !(origin.empty() && fallback_origin.empty() && ssl_origin.empty() &&
           alt_origin.empty() && alt_fallback_origin.empty());
 
+  // quic_globally_disabled_ = command_line.HasSwitch(switches::kDisableQuic);

[bengr, 2015/02/10 20:18:31]

Remove dead code.

[tbansal1, 2015/02/10 22:24:38]

Done.

 
   // Configuring the proxy on the command line overrides the values of
   // |allowed_| and |alt_allowed_|.
   if (configured_on_command_line_)
     allowed_ = true;
   if (!(ssl_origin.empty() &&
         alt_origin.empty()))
     alt_allowed_ = true;
 
   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.
+  LOG(WARNING) << "InitWithoutChecks origin.empty()=" << origin.empty()

[bengr, 2015/02/10 20:18:31]

Remove this logging. If you need it, don't use WARNING unless you really mean
it.

[tbansal1, 2015/02/10 22:24:38]

Done.

+               << " GetDefaultDevOrigin()=" << GetDefaultDevOrigin();
+
   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 IsIncludedInUseQUICFieldTrial() && quic_enabled_for_proxies_

[bengr, 2015/02/10 20:18:31]

Don't check the field trial here.

[tbansal1, 2015/02/10 22:24:38]

see above.

+             ? 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