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);
+  // If strict mixed content checking is enabled then running should not be
+  // allowed.
+  DCHECK(!Java_AwSettings_getUseStricMixedContentCheckingLocked(env, obj) ||
+         !Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj));
   web_prefs->allow_running_insecure_content =
       Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj);
+  web_prefs->strict_mixed_content_checking =
+      Java_AwSettings_getUseStricMixedContentCheckingLocked(env, obj);
 
   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