Use chromium version for data reduction proxy version

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"
 
 namespace data_reduction_proxy {
 
 // The empty version for the authentication protocol. Currently used by
 // Android webview.
 #if defined(OS_ANDROID)
 const char kAndroidWebViewProtocolVersion[] = "";
 #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,
+    DataReductionProxyParams* params,
+    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
+    : client_(client),
+      data_reduction_proxy_params_(params),
+      network_task_runner_(network_task_runner) {
+  GetChromiumBuildAndPatch(ChromiumVersion(), &build_number_, &patch_number_);
+  Init();
+}
+
+DataReductionProxyAuthRequestHandler::DataReductionProxyAuthRequestHandler(
+    const std::string& client,
     const std::string& version,
     DataReductionProxyParams* params,
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
-    : data_reduction_proxy_params_(params),
+    : client_(client),
+      data_reduction_proxy_params_(params),
       network_task_runner_(network_task_runner) {
-  client_ = client;
   GetChromiumBuildAndPatch(version, &build_number_, &patch_number_);
   Init();
 }
 
+std::string DataReductionProxyAuthRequestHandler::ChromiumVersion() const {
+#if defined(PRODUCT_VERSION)
+  return PRODUCT_VERSION;
+#else
+  return std::string();
+#endif
+}
+
+
 void DataReductionProxyAuthRequestHandler::GetChromiumBuildAndPatch(
     const std::string& version,
     std::string* build,
-    std::string* patch) {
+    std::string* patch) const {
   std::vector<std::string> version_parts;
   base::SplitString(version, '.', &version_parts);
   if (version_parts.size() != 4)
     return;
   *build = version_parts[2];
   *patch = version_parts[3];
 }
 
 void DataReductionProxyAuthRequestHandler::Init() {
   InitAuthenticationOnUI(GetDefaultKey());
@@ skipping 134 matching lines @@
   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