diff options
| author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:06:23 +0000 |
|---|---|---|
| committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:06:23 +0000 |
| commit | 85e57d4d0241a31881536262ead36f0aff90b4fc (patch) | |
| tree | 05f0a17b5e3587e6620546261d3e09ddd8e01976 /android_webview/native | |
| parent | 4fd1906bf3b27103da6ff7f46e6528268bc1ba2f (diff) | |
| download | chromium_src-85e57d4d0241a31881536262ead36f0aff90b4fc.zip chromium_src-85e57d4d0241a31881536262ead36f0aff90b4fc.tar.gz chromium_src-85e57d4d0241a31881536262ead36f0aff90b4fc.tar.bz2 | |
Added alternative configuration for the data reduction proxy
Added a second configuration that can support two http proxies and one https proxy. In the process, added a new DataReductionProxyParams object to encapsulate static configuration details and made DataReductionSettingsAndroid a BrowserKeyedContextService.
BUG=370039
Review URL: https://codereview.chromium.org/286013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native')
| -rw-r--r-- | android_webview/native/aw_contents_statics.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc index 0cd4964..70525af 100644 --- a/android_webview/native/aw_contents_statics.cc +++ b/android_webview/native/aw_contents_statics.cc @@ -54,8 +54,8 @@ void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) { DCHECK(browser_context); DataReductionProxySettings* drp_settings = browser_context->GetDataReductionProxySettings(); - DCHECK(drp_settings); - drp_settings->set_key(ConvertJavaStringToUTF8(env, key)); + if (drp_settings) + drp_settings->params()->set_key(ConvertJavaStringToUTF8(env, key)); } // static |