Correcting the version field in the Chrome-Proxy header to be the chromium build and patch number.

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/command_line.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 "crypto/random.h"
 #include "net/proxy/proxy_server.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 namespace data_reduction_proxy {
 
-// The version of the authentication protocol.
+// The empty version for the authentication protocol. Currently used by
+// Android webview.
 const char kProtocolVersion[] = "0";

[Lei Zhang, 2014/08/01 19:11:57]

name this kAndroidWebViewProtocolVersion and wrap it in #if defined(OS_ANDROID)
or whatever is appropriate?

[megjablon, 2014/08/01 20:35:26]

Done.

[Lei Zhang, 2014/08/01 20:43:15]

Same for the header file?

[megjablon, 2014/08/01 21:00:30]

Done.

 
 // The clients supported by the data reduction proxy.
 const char kClientAndroidWebview[] = "webview";
 const char kClientChromeAndroid[] = "android";
 const char kClientChromeIOS[] = "ios";
 
 // static
 bool DataReductionProxyAuthRequestHandler::IsKeySetOnCommandLine() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   return command_line.HasSwitch(
       data_reduction_proxy::switches::kDataReductionProxyKey);
 }
 
 DataReductionProxyAuthRequestHandler::DataReductionProxyAuthRequestHandler(
+    const std::string& client,
+    const std::string& version,
     DataReductionProxyParams* params)
     : data_reduction_proxy_params_(params) {
-  version_ = kProtocolVersion;
-#if defined(OS_ANDROID)
-  client_ = kClientChromeAndroid;
-#elif defined(OS_IOS)
-  client_ = kClientChromeIOS;
-#endif
+  client_ = client;
+  version_ = version;
   Init();
 }
 
 void DataReductionProxyAuthRequestHandler::Init() {
   InitAuthentication(GetDefaultKey());
 }
 
 
 DataReductionProxyAuthRequestHandler::~DataReductionProxyAuthRequestHandler() {
 }
@@ skipping 62 matching lines @@
                                  static_cast<long long>(timestamp),
                                  rand[0],
                                  rand[1],
                                  rand[2]);
   credentials_ = base::UTF16ToUTF8(AuthHashForSalt(timestamp, key_));
 
   DVLOG(1) << "session: [" << session_ << "] "
            << "password: [" << credentials_  << "]";
 }
 
-void DataReductionProxyAuthRequestHandler::SetKey(const std::string& key,
-                                                  const std::string& client,
-                                                  const std::string& version) {
-  client_ = client;
-  version_ = version;
+void DataReductionProxyAuthRequestHandler::SetKey(const std::string& key) {
   if (!key.empty())
     InitAuthentication(key);
 }
 
 
 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)
   if (key.empty())
     key = SPDY_PROXY_AUTH_VALUE;
 #endif
   return key;
 }
 
 }  // namespace data_reduction_proxy