summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authormegjablon@chromium.org <megjablon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 06:57:07 +0000
committermegjablon@chromium.org <megjablon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 06:57:07 +0000
commit0f9e5b14cb75b2ac53ad3576125ba045f5ec53e2 (patch)
tree9cc85aa4449040a9c84c91f44e6b8acf5f0e5eef /android_webview
parent82f3d0b93dfffe25a62ed5afa2015c7d1bbea9ba (diff)
downloadchromium_src-0f9e5b14cb75b2ac53ad3576125ba045f5ec53e2.zip
chromium_src-0f9e5b14cb75b2ac53ad3576125ba045f5ec53e2.tar.gz
chromium_src-0f9e5b14cb75b2ac53ad3576125ba045f5ec53e2.tar.bz2
The data reduction proxy client should be specific about it's capabilities by specifying the version of the proxy client that is being used.
A version field is now added to the Chrome-Proxy header in requests, but that version is set to zero. This corrects the version field in the Chrome-Proxy header to be the chromium build and patch number. BUG=367268 Review URL: https://codereview.chromium.org/430643002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/aw_browser_context.cc2
-rw-r--r--android_webview/native/aw_contents_statics.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 15f1c8a..614bd82 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -105,6 +105,8 @@ void AwBrowserContext::PreMainMessageLoopRun() {
data_reduction_proxy::DataReductionProxyParams::kAllowed)));
data_reduction_proxy_auth_request_handler_.reset(
new DataReductionProxyAuthRequestHandler(
+ data_reduction_proxy::kClientAndroidWebview,
+ data_reduction_proxy::kAndroidWebViewProtocolVersion,
data_reduction_proxy_settings_->params()));
#endif
diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc
index 3f2ab86..9888aad 100644
--- a/android_webview/native/aw_contents_statics.cc
+++ b/android_webview/native/aw_contents_statics.cc
@@ -58,9 +58,7 @@ void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) {
browser_context->GetDataReductionProxyAuthRequestHandler();
if (drp_auth_request_handler)
drp_auth_request_handler->SetKey(
- ConvertJavaStringToUTF8(env, key),
- data_reduction_proxy::kClientAndroidWebview,
- data_reduction_proxy::kProtocolVersion);
+ ConvertJavaStringToUTF8(env, key));
}
// static