Index: LayoutTests/http/tests/security/mixedContent/upgrade-image-in-frame.https.html |
diff --git a/LayoutTests/http/tests/security/mixedContent/strict-mode-image-in-frame-blocked.https.html b/LayoutTests/http/tests/security/mixedContent/upgrade-image-in-frame.https.html |
similarity index 51% |
copy from LayoutTests/http/tests/security/mixedContent/strict-mode-image-in-frame-blocked.https.html |
copy to LayoutTests/http/tests/security/mixedContent/upgrade-image-in-frame.https.html |
index da89e731b83a629d6629a5c16f98eebd1ec701fd..74b8f7ead70fa446b1dc52f7bf5189c93614ae0c 100644 |
--- a/LayoutTests/http/tests/security/mixedContent/strict-mode-image-in-frame-blocked.https.html |
+++ b/LayoutTests/http/tests/security/mixedContent/upgrade-image-in-frame.https.html |
@@ -1,11 +1,15 @@ |
<!doctype html> |
<html> |
<head> |
- <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> |
+ <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-content"> |
<script> |
if (window.testRunner) { |
testRunner.waitUntilDone(); |
testRunner.dumpAsText(); |
+ testRunner.dumpChildFramesAsText(); |
+ testRunner.dumpResourceLoadCallbacks(); |
+ testRunner.dumpResourceRequestCallbacks(); |
+ testRunner.overridePreference("WebKitAllowDisplayingInsecureContent", false); |
} |
window.addEventListener("message", function (e) { |
if (window.testRunner) |
@@ -14,7 +18,7 @@ |
</script> |
</head> |
<body> |
- <p>This test passes if the image in the frame below is treated as blockable content.</p> |
+ <p>This test passes if the image in the frame below is loaded securely.</p> |
<iframe src="resources/frame-with-insecure-image.html"></iframe> |
</body> |
</html> |