| Index: third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html b/third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html
|
| index 88175fa3cbc5f39b891ce60a081c06049f8e3a31..9841771794212f430391156d55cdea87503599e0 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html
|
| +++ b/third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html
|
| @@ -6,8 +6,6 @@ if (window.testRunner) {
|
| testRunner.dumpAsText();
|
| testRunner.setCanOpenWindows();
|
| testRunner.setCloseRemainingWindowsWhenComplete(true);
|
| - testRunner.overridePreference("WebKitAllowDisplayingInsecureContent", false);
|
| - testRunner.setAllowDisplayOfInsecureContent(true);
|
| }
|
|
|
| window.addEventListener("message", function (e) {
|
| @@ -17,8 +15,7 @@ window.addEventListener("message", function (e) {
|
|
|
| </script>
|
| <p>This test opens a window that loads an insecure image. We should trigger
|
| -a mixed content callback even though we've set the preference to block this,
|
| -because we've overriden the preference via a web permission client callback.</p>
|
| +a mixed content callback because passive mixed content is allowed by default.</p>
|
| <script>
|
| window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html");
|
| </script>
|
|
|