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..720fcf4ce558a766c910dcfd99a4b836c1a8c7a4 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,7 +20,8 @@ |
namespace data_reduction_proxy { |
-// The version of the authentication protocol. |
+// The empty version for the authentication protocol. Currently used by |
+// android webview. |
bengr
2014/08/01 16:05:18
Android
megjablon
2014/08/01 17:30:36
Done.
|
const char kProtocolVersion[] = "0"; |
// The clients supported by the data reduction proxy. |
@@ -36,14 +37,12 @@ bool DataReductionProxyAuthRequestHandler::IsKeySetOnCommandLine() { |
} |
DataReductionProxyAuthRequestHandler::DataReductionProxyAuthRequestHandler( |
+ const std::string& client, |
+ const std::string& version, |
DataReductionProxyParams* params) |
: data_reduction_proxy_params_(params) { |
- version_ = kProtocolVersion; |
-#if defined(OS_ANDROID) |
- client_ = kClientChromeAndroid; |
-#elif defined(OS_IOS) |
- client_ = kClientChromeIOS; |
-#endif |
+ client_ = client; |
+ version_ = version; |
Init(); |
} |
@@ -126,11 +125,7 @@ void DataReductionProxyAuthRequestHandler::InitAuthentication( |
<< "password: [" << credentials_ << "]"; |
} |
-void DataReductionProxyAuthRequestHandler::SetKey(const std::string& key, |
- const std::string& client, |
- const std::string& version) { |
- client_ = client; |
- version_ = version; |
+void DataReductionProxyAuthRequestHandler::SetKey(const std::string& key) { |
if (!key.empty()) |
InitAuthentication(key); |
} |