Expose data reduction proxy auth token for internal builds.

components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.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_auth_request_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_headers.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h"
 #include "components/data_reduction_proxy/common/version.h"
 #include "crypto/random.h"
 #include "net/base/host_port_pair.h"
 #include "net/proxy/proxy_server.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#include "google_apis/google_api_keys.h"
+#endif
+
 namespace data_reduction_proxy {
 
 // The empty version for the authentication protocol. Currently used by
 // Android webview.
 #if defined(OS_ANDROID)
 const char kAndroidWebViewProtocolVersion[] = "";
 #endif
 
 #define CLIENT_ENUM(name, str_value) \
     case name: return str_value;
@@ skipping 170 matching lines @@
 
   key_ = key;
   last_update_time_ = Now();
   ComputeCredentials(last_update_time_, &session_, &credentials_);
 }
 
 std::string DataReductionProxyAuthRequestHandler::GetDefaultKey() const {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string key =
     command_line.GetSwitchValueASCII(switches::kDataReductionProxyKey);
 #if defined(SPDY_PROXY_AUTH_VALUE)

[bengr, 2014/10/10 00:26:07]

Is this ever defined outside of iOS and Android? If not, should you be more
explicit:

#if defined(OS_ANDROID) || defined(OS_IOS)
#if defined(SPDY_PROXY_AUTH_VALUE)
...
#endif
#else
 k = google_apis::...
#endif

[Not at Google. Contact bengr, 2014/10/10 18:55:43]

Done.

   if (key.empty())
     key = SPDY_PROXY_AUTH_VALUE;
 #endif
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)

[bengr, 2014/10/10 00:26:07]

Presuming this doesn't bloat WebView or Cronet, can we use this approach on all
platforms?

[Not at Google. Contact bengr, 2014/10/10 18:55:43]

It will increase the size by about 1.4M. Also the gypi mechanism better and we
might be able to make use of that in the future for all platforms.

+  // On Android and iOS this value is obtained from supplement.gypi. We avoid

[bengr, 2014/10/10 00:26:06]

I wouldn't describe how internal code works. Instead, add a comment above line
220 that says:

// Android and iOS get the default key from a preprocessor constant. All other
platforms
// get the key from google_apis.

[Not at Google. Contact bengr, 2014/10/10 18:55:43]

Done.

+  // this dependency when possible to reduce the size of this component.
+  if (key.empty()) {
+    key = google_apis::GetSpdyProxyAuthValue();
+  }
+#endif
   return key;
 }
 
 void DataReductionProxyAuthRequestHandler::MaybeAddRequestHeaderImpl(
     const net::HostPortPair& proxy_server,
     bool expect_ssl,
     net::HttpRequestHeaders* request_headers) {
   if (proxy_server.IsEmpty())
     return;
   if (data_reduction_proxy_params_ &&
       data_reduction_proxy_params_->IsDataReductionProxy(proxy_server, NULL) &&
       net::HostPortPair::FromURL(
           data_reduction_proxy_params_->ssl_origin()).Equals(
               proxy_server) == expect_ssl) {
     AddAuthorizationHeader(request_headers);
   }
 }
 
 }  // namespace data_reduction_proxy