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

Unified Diff: LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-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
« no previous file with comments | « no previous file | LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt
diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt
index bb55e6aa9c9fc1981e9fcee288c65536de11185e..ec36f0bf47950cff52cba96788459ce541ec1ad2 100644
--- a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt
@@ -1,3 +1,5 @@
+CONSOLE MESSAGE: line 8: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-frame.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
+
This test loads a secure iframe that loads an insecure iframe. We should *not* get a mixed content callback becase the main frame is HTTP and the grandchild iframe doesn't contaminate the child iframe's security origin with mixed content.
« no previous file with comments | « no previous file | LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698