diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
| commit | d46bc310b61db608ee250f042292364c7bf44656 (patch) | |
| tree | ed8033562cef79f3f750ed7113aed88c4c205607 /android_webview/native | |
| parent | 8dcaa264e5fa488d2ac287bf63d2376259fdab25 (diff) | |
| download | chromium_src-d46bc310b61db608ee250f042292364c7bf44656.zip chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.gz chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.bz2 | |
Revert 273810 "Added alternative configuration for the data redu..."
Reverting due to failing tests. See http://crbug.com/370039#c5 for details.
> 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
TBR=bengr@chromium.org
Review URL: https://codereview.chromium.org/307013003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273824 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 70525af..0cd4964 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(); - if (drp_settings) - drp_settings->params()->set_key(ConvertJavaStringToUTF8(env, key)); + DCHECK(drp_settings); + drp_settings->set_key(ConvertJavaStringToUTF8(env, key)); } // static |