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

Unified Diff: third_party/WebKit/LayoutTests/http/tests/security/secureContexts/authenticated.html

Issue 1745333002: Fix secureContexts layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add unauthenticated.html to site-per-process expectations Created 4 years, 10 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: third_party/WebKit/LayoutTests/http/tests/security/secureContexts/authenticated.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/secureContexts/authenticated.html b/third_party/WebKit/LayoutTests/http/tests/security/secureContexts/authenticated.html
index b88da39225a5bfaf45db1401b7725bed0b1f7947..07a070f56dea644bd9c9edd4ddbc0a94d3ade6e1 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/secureContexts/authenticated.html
+++ b/third_party/WebKit/LayoutTests/http/tests/security/secureContexts/authenticated.html
@@ -8,6 +8,9 @@
</head>
<body>
<script>
+ if (window.testRunner)
+ testRunner.overridePreference("WebKitAllowRunningInsecureContent", true);
+
if (window.location.origin != get_host_info().AUTHENTICATED_ORIGIN) {
window.location = get_host_info().AUTHENTICATED_ORIGIN +
window.location.pathname;
@@ -31,18 +34,12 @@
var i1 = document.createElement("iframe");
i1.src = get_host_info().UNAUTHENTICATED_ORIGIN + "/security/secureContexts/resources/post-securecontext-status.html";
- // This will almost certainly be blocked by the mixed content checker, handle that case by incrementing the `messages` count.
- i1.addEventListener("error", t.step_func(function (e) {
- messages++;
- if (messages >= 2)
- t.done();
- }), false);
document.body.appendChild(i1);
var i2 = document.createElement("iframe");
i2.src = get_host_info().AUTHENTICATED_ORIGIN + "/security/secureContexts/resources/post-securecontext-status.html";
document.body.appendChild(i2);
- }, "Frames are either secure or insecure (and blocked by mixed content).");
+ }, "Frames are either secure or insecure.");
}
</script>
</body>

Powered by Google App Engine
This is Rietveld 408576698