Move data reduction proxy to Chrome-Proxy header for authentication

components/data_reduction_proxy/browser/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/browser/data_reduction_proxy_params.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h"
 #include "net/proxy/proxy_info.h"
@@ skipping 27 matching lines @@
       "DataCompressionProxyPromoVisibility") == kEnabled;
 }
 
 // static
 bool DataReductionProxyParams::IsIncludedInPreconnectHintingFieldTrial() {
   return IsIncludedInFieldTrial() &&
       FieldTrialList::FindFullName(
           "DataCompressionProxyPreconnectHints") == kEnabled;
 }
 
-// static
-bool DataReductionProxyParams::IsKeySetOnCommandLine() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  return command_line.HasSwitch(
-      data_reduction_proxy::switches::kEnableDataReductionProxy);
-}
-
 DataReductionProxyParams::DataReductionProxyParams(int flags)
     : allowed_((flags & kAllowed) == kAllowed),
       fallback_allowed_((flags & kFallbackAllowed) == kFallbackAllowed),
       alt_allowed_((flags & kAlternativeAllowed) == kAlternativeAllowed),
-      promo_allowed_((flags & kPromoAllowed) == kPromoAllowed) {
+      promo_allowed_((flags & kPromoAllowed) == kPromoAllowed),
+      configured_on_command_line_(false) {
   bool result = Init(allowed_, fallback_allowed_, alt_allowed_);
   DCHECK(result);
 }
 
 DataReductionProxyParams::~DataReductionProxyParams() {
 }
 
 DataReductionProxyParams::DataReductionProxyList
 DataReductionProxyParams::GetAllowedProxies() const {
   DataReductionProxyList list;
   if (allowed_)
     list.push_back(origin_);
   if (allowed_ && fallback_allowed_)
     list.push_back(fallback_origin_);
   if (alt_allowed_) {
     list.push_back(alt_origin_);
     list.push_back(ssl_origin_);
   }
   if (alt_allowed_ && fallback_allowed_)
     list.push_back(alt_fallback_origin_);
   return list;
 }
 
 DataReductionProxyParams::DataReductionProxyParams(int flags,
                                                    bool should_call_init)
     : allowed_((flags & kAllowed) == kAllowed),
       fallback_allowed_((flags & kFallbackAllowed) == kFallbackAllowed),
       alt_allowed_((flags & kAlternativeAllowed) == kAlternativeAllowed),
-      promo_allowed_((flags & kPromoAllowed) == kPromoAllowed) {
+      promo_allowed_((flags & kPromoAllowed) == kPromoAllowed),
+      configured_on_command_line_(false) {
   if (should_call_init) {
     bool result = Init(allowed_, fallback_allowed_, alt_allowed_);
     DCHECK(result);
   }
 }
 
 bool DataReductionProxyParams::Init(
     bool allowed, bool fallback_allowed, bool alt_allowed) {
   InitWithoutChecks();
   // Verify that all necessary params are set.
@@ skipping 66 matching lines @@
   if (origin.empty())
     origin = command_line.GetSwitchValueASCII(switches::kDataReductionProxy);
   std::string fallback_origin =
       command_line.GetSwitchValueASCII(switches::kDataReductionProxyFallback);
   std::string ssl_origin =
       command_line.GetSwitchValueASCII(switches::kDataReductionSSLProxy);
   std::string alt_origin =
       command_line.GetSwitchValueASCII(switches::kDataReductionProxyAlt);
   std::string alt_fallback_origin = command_line.GetSwitchValueASCII(
       switches::kDataReductionProxyAltFallback);
-  key_ = command_line.GetSwitchValueASCII(switches::kDataReductionProxyKey);
 
-  bool configured_on_command_line =
+  configured_on_command_line_ =
       !(origin.empty() && fallback_origin.empty() && ssl_origin.empty() &&
           alt_origin.empty() && alt_fallback_origin.empty());
 
 
   // Configuring the proxy on the command line overrides the values of
   // |allowed_| and |alt_allowed_|.
-  if (configured_on_command_line)
+  if (configured_on_command_line_)
     allowed_ = true;
   if (!(ssl_origin.empty() &&
         alt_origin.empty() &&
         alt_fallback_origin.empty()))
     alt_allowed_ = true;
 
-  // Only use default key if non of the proxies are configured on the command
-  // line.
-  if (key_.empty() && !configured_on_command_line)
-    key_ = GetDefaultKey();
-
   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();
   if (origin.empty())
@@ skipping 84 matching lines @@
   net::ProxyInfo result;
   request->context()->proxy_service()->config().proxy_rules().Apply(
       request->url(), &result);
   if (!result.proxy_server().is_valid())
     return false;
   if (result.proxy_server().is_direct())
     return false;
   return IsDataReductionProxy(result.proxy_server().host_port_pair(), NULL);
 }
 
-std::string DataReductionProxyParams::GetDefaultKey() const {
-#if defined(SPDY_PROXY_AUTH_VALUE)
-  return SPDY_PROXY_AUTH_VALUE;
-#endif
-  return std::string();
-}
-
 std::string DataReductionProxyParams::GetDefaultDevOrigin() const {
 #if defined(DATA_REDUCTION_DEV_HOST)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDisableDataReductionProxyDev))
     return std::string();
   if (command_line.HasSwitch(switches::kEnableDataReductionProxyDev) ||
       (FieldTrialList::FindFullName("DataCompressionProxyDevRollout") ==
          kEnabled)) {
     return DATA_REDUCTION_DEV_HOST;
   }
@@ skipping 44 matching lines @@
 }
 
 std::string DataReductionProxyParams::GetDefaultWarmupURL() const {
 #if defined(DATA_REDUCTION_PROXY_WARMUP_URL)
   return DATA_REDUCTION_PROXY_WARMUP_URL;
 #endif
   return std::string();
 }
 
 }  // namespace data_reduction_proxy