Add build and patch to Chrome-Proxy header

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 "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 empty version for the authentication protocol. Currently used by
 // Android webview.
 #if defined(OS_ANDROID)
-const char kAndroidWebViewProtocolVersion[] = "0";
+const char kAndroidWebViewProtocolVersion[] = "";

[bengr, 2014/09/04 19:22:52]

Add:
// TODO(bengr): Remove when this class determines the version.

 #endif
 
 // 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,
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
     : data_reduction_proxy_params_(params),
       network_task_runner_(network_task_runner) {
   client_ = client;
-  version_ = version;
+  build_number_ = GetChromiumVersionComponent(version, 2);
+  patch_number_ = GetChromiumVersionComponent(version, 3);

[bengr, 2014/09/04 19:22:52]

Since you are doing the same work twice, why not have this function:

void GetChromiumBuildAndPatchNumbers(const std::string& version,
                                     std::string* build,
                                     std::string* patch) {
  // ... split the version, check that build and patch are non NULL
  *build = version_parts[2];
  *patch = version_parts[3];
}

[megjablon, 2014/09/04 20:30:35]

Done.

   Init();
 }
 
+std::string DataReductionProxyAuthRequestHandler::GetChromiumVersionComponent(
+    std::string version, int index) {

[bengr, 2014/09/04 19:22:52]

use const std::string version&

[megjablon, 2014/09/04 20:30:35]

Done.

+  std::vector<std::string> version_parts;
+  base::SplitString(version, '.', &version_parts);
+  if (version_parts.size() != 4)
+    return std::string();
+  return version_parts[index];
+}
+
 void DataReductionProxyAuthRequestHandler::Init() {
   InitAuthenticationOnUI(GetDefaultKey());
 }
 
 
 DataReductionProxyAuthRequestHandler::~DataReductionProxyAuthRequestHandler() {
 }
 
 // static
 base::string16 DataReductionProxyAuthRequestHandler::AuthHashForSalt(
@@ skipping 40 matching lines @@
     ComputeCredentials(last_update_time_, &session_, &credentials_);
   }
   const char kChromeProxyHeader[] = "Chrome-Proxy";
   std::string header_value;
   if (headers->HasHeader(kChromeProxyHeader)) {
     headers->GetHeader(kChromeProxyHeader, &header_value);
     headers->RemoveHeader(kChromeProxyHeader);
     header_value += ", ";
   }
   header_value +=
-      "ps=" + session_ + ", sid=" + credentials_ +  ", v=" + version_;
+      "ps=" + session_ + ", sid=" + credentials_;
+  if (!build_number_.empty() && !patch_number_.empty())
+      header_value += ", b=" + build_number_ + ", p=" + patch_number_;

[bengr, 2014/09/04 19:22:52]

indent only 2 from the 'if'

   if (!client_.empty())
     header_value += ", c=" + client_;
   headers->SetHeader(kChromeProxyHeader, header_value);
 }
 
 void DataReductionProxyAuthRequestHandler::InitAuthenticationOnUI(
     const std::string& key) {
   network_task_runner_->PostTask(FROM_HERE, base::Bind(
       &DataReductionProxyAuthRequestHandler::InitAuthentication,
       base::Unretained(this),
@@ skipping 41 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