Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt

Issue 19551006: Re-instantiate the mixed iframe block for M30. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt
diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt
index a4c6692d0ec8febd05cb6a28ddb4454691e5e1a9..7915dc3fcf857cff6af467d57323066db7cd3dce 100644
--- a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 9: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-iframe.html displayed insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
+CONSOLE MESSAGE: line 9: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-iframe.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
This test opens a window that loads an insecure iframe. 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.

Powered by Google App Engine
This is Rietveld 408576698