Use chromium version for data reduction proxy version

components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h

 // 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.
 
 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_
 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
@@ skipping 22 matching lines @@
 extern const char kClientChromeAndroid[];
 extern const char kClientChromeIOS[];
 
 class DataReductionProxyParams;
 
 class DataReductionProxyAuthRequestHandler {
  public:
   static bool IsKeySetOnCommandLine();
 
   // Constructs a DataReductionProxyAuthRequestHandler object with the given
-  // client, version, params, and network task runner. The Chromium |version| is
-  // expected to be of the form "xx.xx.xx.xx". If it isn't of this form,
-  // |build_number_| and |patch_number_| are set to empty strings and not
-  // included in the header. http://crbug.com/410127 will change this so that
-  // the version is retrieved inside this constructor.
+  // client type, params, and network task runner.
   DataReductionProxyAuthRequestHandler(
       const std::string& client,
-      const std::string& version,
       DataReductionProxyParams* params,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
 
   virtual ~DataReductionProxyAuthRequestHandler();
 
   // Adds a 'Chrome-Proxy' header to |request_headers| with the data reduction
   // proxy authentication credentials. Only adds this header if the provided
   // |proxy_server| is a data reduction proxy and not the data reduction proxy's
   // CONNECT server. Must be called on the IO thread.
   void MaybeAddRequestHeader(net::URLRequest* request,
@@ skipping 24 matching lines @@
   // the data reduction proxy feature isn't available.
   static base::string16 AuthHashForSalt(int64 salt,
                                         const std::string& key);
   // Visible for testing.
   virtual base::Time Now() const;
   virtual void RandBytes(void* output, size_t length);
 
   // Visible for testing.
   virtual std::string GetDefaultKey() const;
 
+  // Visible for testing.
+  DataReductionProxyAuthRequestHandler(
+      const std::string& client,
+      const std::string& version,
+      DataReductionProxyParams* params,
+      scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
+
  private:
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyAuthRequestHandlerTest,
                            Authorization);
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyAuthRequestHandlerTest,
                            AuthorizationBogusVersion);
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyAuthRequestHandlerTest,
                            AuthHashForSalt);
 
+  // Returns the version of Chromium that is being used.
+  std::string ChromiumVersion() const;
+
   // Returns the build and patch numbers of |version|. If |version| isn't of the
   // form xx.xx.xx.xx build and patch are not modified.
   void GetChromiumBuildAndPatch(const std::string& version,
                                 std::string* build,
-                                std::string* patch);
+                                std::string* patch) const;
 
   // Stores the supplied key and sets up credentials suitable for authenticating
   // with the data reduction proxy.
   void InitAuthentication(const std::string& key);
 
   // Generates a session ID and credentials suitable for authenticating with
   // the data reduction proxy.
   void ComputeCredentials(const base::Time& now,
                           std::string* session,
                           std::string* credentials);
@@ skipping 25 matching lines @@
 
   DataReductionProxyParams* data_reduction_proxy_params_;
 
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxyAuthRequestHandler);
 };
 
 }  // namespace data_reduction_proxy
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_