Index: components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc |
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc |
index 6130eda1b94f3017ca29bfdb067696a723d74a41..4eb125bf44e0cb2a0820bcfe60104b2e720cf2e9 100644 |
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc |
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc |
@@ -20,9 +20,6 @@ |
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"; |
@@ -36,9 +33,11 @@ bool DataReductionProxyAuthRequestHandler::IsKeySetOnCommandLine() { |
} |
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/ch
megjablon
2014/07/30 20:37:17
Done.
|
#if defined(OS_ANDROID) |
client_ = kClientChromeAndroid; |
#elif defined(OS_IOS) |