From d46bc310b61db608ee250f042292364c7bf44656 Mon Sep 17 00:00:00 2001 From: "battre@chromium.org" Date: Fri, 30 May 2014 13:44:43 +0000 Subject: 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 --- android_webview/native/aw_contents_statics.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'android_webview/native') 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 -- cgit v1.1