Remove the allow-displaying-mixed-content setting from Blink.

android_webview/native/aw_settings.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
@@ skipping 411 matching lines @@
     // Any canvas smaller than this will fallback to software. Abusing this
     // slightly to turn canvas off without changing
     // accelerated_2d_canvas_enabled, which also affects compositing mode.
     // Using 100M instead of max int to avoid overflows.
     web_prefs->minimum_accelerated_2d_canvas_size = 100 * 1000 * 1000;
   }
   web_prefs->experimental_webgl_enabled =
       web_prefs->experimental_webgl_enabled &&
       enable_supported_hardware_accelerated_features;
 
-  web_prefs->allow_displaying_insecure_content =
-      Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj);
-  web_prefs->allow_running_insecure_content =
-      Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj);
+  // If mixed content running is allowed than displaying must be allowed too.
+  DCHECK(!Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj) ||
+         Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj));

[Torne, 2016/08/31 12:49:59]

These two DCHECKs are identical? Also, it'd be clearer to use DCHECK_IMPLIES,
since what you have here is an implies relation.

[carlosk, 2016/09/02 23:47:42]

Indeed. But as you also realized, DCHECK_IMPLIES is sadly no more.

+  // If mixed content displaying is not allowed than running must not be allowed
+  // either.
+  DCHECK(Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj) ||
+         !Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj));
+  if (Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj)) {

[Torne, 2016/08/31 12:49:59]

The actual Java side value stored is an enum:
WebSettings.MIXED_CONTENT_ALWAYS_ALLOW, MIXED_CONTENT_NEVER_ALLOW,
MIXED_CONTENT_COMPATIBILITY_MODE. Currently the Java code in AwContents converts
this into two bools because that's the form web_prefs used to want.

I think it would be clearer here to either:
1) Change the Java code to just return the actual enum value to native, and let
the native code map that to strict_mixed_content_checking and
allow_running_insecure_content
or 2) Change the Java code to map the enum value to those actual two bools (and
rename the functions), and have the native code continue to be trivial
assignments to web_prefs.

rather than trying to keep the JNI the same.

[carlosk, 2016/09/02 23:47:42]

Agreed. I didn't realize those getters were used only here.

As I don't see a C++ version of those enum values I'll go with 2) as the logic
will be in Java where the enum is defined.

+    web_prefs->strict_mixed_content_checking = false;
+    web_prefs->allow_running_insecure_content =
+        Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj);
+  } else {
+    web_prefs->strict_mixed_content_checking = true;
+    web_prefs->allow_running_insecure_content = false;
+  }
 
   web_prefs->fullscreen_supported =
       Java_AwSettings_getFullscreenSupportedLocked(env, obj);
   web_prefs->record_whole_document =
       Java_AwSettings_getRecordFullDocument(env, obj);
 
   // TODO(jww): This should be removed once sufficient warning has been given of
   // possible API breakage because of disabling insecure use of geolocation.
   web_prefs->allow_geolocation_on_insecure_origins =
       Java_AwSettings_getAllowGeolocationOnInsecureOrigins(env, obj);
@@ skipping 12 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz) {
   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent());
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview