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.
-const char kProtocolVersion[] = "0";
-
 // 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(
-    DataReductionProxyParams* params)
+    DataReductionProxyParams* params, std::string version)
     : data_reduction_proxy_params_(params) {
-  version_ = kProtocolVersion;
+  // The data reduction proxy only needs the build and patch number for the
+  // version.
+  version_ = version.substr(version.find(".")).substr(version.find(".") + 1);

[bengr, 2014/07/30 00:16:47]

Use SplitString. See:
https://code.google.com/p/chromium/codesearch#chromium/src/base/strings/strin...


Put it in a utility function here that can be used by embedders. Add a test for
the function.

[megjablon, 2014/07/30 20:37:17]

Done.

 #if defined(OS_ANDROID)
   client_ = kClientChromeAndroid;
 #elif defined(OS_IOS)
   client_ = kClientChromeIOS;
 #endif
   Init();
 }
 
 void DataReductionProxyAuthRequestHandler::Init() {
   InitAuthentication(GetDefaultKey());
@@ skipping 89 matching lines @@
   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