Backed out 5 changesets (bug 1533877) for causing wpt permafailure in /html/cross-origin/anonymous.tentative.html CLOSED TREE
authorshindli <shindli@mozilla.com>
Mon, 03 Jun 2019 22:06:38 +0300
changeset 476658 c15e88a7c4877694bdc3b11bff90895fc17ae65c
parent 476657 4967a509cea08492c842f457b7a56084d26fc34d
child 476659 95f3098dc3f0b35ad24e7f5d1c9a232397dd679a
push id36104
push usercbrindusan@mozilla.com
push dateTue, 04 Jun 2019 03:45:41 +0000
treeherdermozilla-central@38c2478a4825 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1533877
milestone69.0a1
backs out1804d3178cd423bf834a8610a9b373911857dd83
b5a3e938f421d806f6da9a72bf97e1a9f5128179
08efb10cceb24a94e5ba16b00dc182bf8c3c3633
c4b8d755873bf53bd56bcc18ba6072f3b684bd36
e53056e11429f1342f867edb37ef021b86405b66
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 5 changesets (bug 1533877) for causing wpt permafailure in /html/cross-origin/anonymous.tentative.html CLOSED TREE Backed out changeset 1804d3178cd4 (bug 1533877) Backed out changeset b5a3e938f421 (bug 1533877) Backed out changeset 08efb10cceb2 (bug 1533877) Backed out changeset c4b8d755873b (bug 1533877) Backed out changeset e53056e11429 (bug 1533877)
docshell/base/BrowsingContext.cpp
docshell/base/BrowsingContextFieldList.h
netwerk/protocol/http/nsHttpChannel.cpp
testing/web-platform/meta/html/cross-origin/anonymous.tentative.html.ini
testing/web-platform/meta/html/cross-origin/null.tentative.html.ini
testing/web-platform/meta/html/cross-origin/usecredentials.tentative.html.ini
testing/web-platform/tests/html/cross-origin/anonymous.tentative.html
testing/web-platform/tests/html/cross-origin/anonymous.tentative.html.headers
testing/web-platform/tests/html/cross-origin/null.tentative.html
testing/web-platform/tests/html/cross-origin/null.tentative.html.headers
testing/web-platform/tests/html/cross-origin/resources/navigate_anonymous.sub.html
testing/web-platform/tests/html/cross-origin/resources/navigate_anonymous.sub.html.headers
testing/web-platform/tests/html/cross-origin/resources/navigate_null.sub.html
testing/web-platform/tests/html/cross-origin/resources/navigate_usecredentials.sub.html
testing/web-platform/tests/html/cross-origin/resources/navigate_usecredentials.sub.html.headers
testing/web-platform/tests/html/cross-origin/resources/nothing.txt
testing/web-platform/tests/html/cross-origin/resources/nothing.txt.headers
testing/web-platform/tests/html/cross-origin/resources/popup_and_close.sub.html
testing/web-platform/tests/html/cross-origin/resources/popup_and_close.sub.html.headers
testing/web-platform/tests/html/cross-origin/usecredentials.tentative.html
testing/web-platform/tests/html/cross-origin/usecredentials.tentative.html.headers
testing/web-platform/tests/lint.whitelist
--- a/docshell/base/BrowsingContext.cpp
+++ b/docshell/base/BrowsingContext.cpp
@@ -111,23 +111,21 @@ already_AddRefed<BrowsingContext> Browsi
   } else {
     context = new BrowsingContext(aParent, group, id, aType);
   }
 
   // The name and opener fields need to be explicitly initialized. Don't bother
   // using transactions to set them, as we haven't been attached yet.
   context->mName = aName;
   context->mOpenerId = aOpener ? aOpener->Id() : 0;
-  context->mCrossOriginPolicy = nsILoadInfo::CROSS_ORIGIN_POLICY_NULL;
-  context->mInheritedCrossOriginPolicy = nsILoadInfo::CROSS_ORIGIN_POLICY_NULL;
 
   BrowsingContext* inherit = aParent ? aParent : aOpener;
   if (inherit) {
     context->mOpenerPolicy = inherit->mOpenerPolicy;
-    context->mInheritedCrossOriginPolicy = inherit->mCrossOriginPolicy;
+    context->mCrossOriginPolicy = inherit->mCrossOriginPolicy;
   }
 
   Register(context);
 
   // Attach the browsing context to the tree.
   context->Attach();
 
   return context.forget();
--- a/docshell/base/BrowsingContextFieldList.h
+++ b/docshell/base/BrowsingContextFieldList.h
@@ -12,17 +12,16 @@
 // validators.
 #ifndef MOZ_BC_FIELD_RACY
 #  define MOZ_BC_FIELD_RACY MOZ_BC_FIELD
 #endif
 
 MOZ_BC_FIELD_RACY(Name, nsString)
 MOZ_BC_FIELD_RACY(Closed, bool)
 MOZ_BC_FIELD(CrossOriginPolicy, nsILoadInfo::CrossOriginPolicy)
-MOZ_BC_FIELD(InheritedCrossOriginPolicy, nsILoadInfo::CrossOriginPolicy)
 MOZ_BC_FIELD(OpenerPolicy, nsILoadInfo::CrossOriginOpenerPolicy)
 
 // The current opener for this BrowsingContext. This is a weak reference, and
 // stored as the opener ID.
 MOZ_BC_FIELD(OpenerId, uint64_t)
 
 // Toplevel browsing contexts only. This field controls whether the browsing
 // context is currently considered to be activated by a gesture.
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -7512,18 +7512,17 @@ nsresult nsHttpChannel::ProcessCrossOrig
   } else {
     mLoadInfo->GetFrameBrowsingContext(getter_AddRefs(ctx));
   }
 
   if (!ctx) {
     return NS_OK;
   }
 
-  nsILoadInfo::CrossOriginPolicy documentPolicy =
-      ctx->GetInheritedCrossOriginPolicy();
+  nsILoadInfo::CrossOriginPolicy documentPolicy = ctx->GetCrossOriginPolicy();
   nsILoadInfo::CrossOriginPolicy resultPolicy =
       nsILoadInfo::CROSS_ORIGIN_POLICY_NULL;
   rv = GetResponseCrossOriginPolicy(&resultPolicy);
   if (NS_FAILED(rv)) {
     return NS_OK;
   }
 
   ctx->SetCrossOriginPolicy(resultPolicy);
deleted file mode 100644
--- a/testing/web-platform/meta/html/cross-origin/anonymous.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[anonymous.tentative.html]
-  prefs: [browser.tabs.remote.useCrossOriginPolicy:true]
deleted file mode 100644
--- a/testing/web-platform/meta/html/cross-origin/null.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[null.tentative.html]
-  prefs: [browser.tabs.remote.useCrossOriginPolicy:true]
deleted file mode 100644
--- a/testing/web-platform/meta/html/cross-origin/usecredentials.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[usecredentials.tentative.html]
-  prefs: [browser.tabs.remote.useCrossOriginPolicy:true]
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/anonymous.tentative.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!doctype html>
-<meta name="timeout" content="long">
-<title>Cross-Origin header and nested navigable resource without such header</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/get-host-info.sub.js"></script>
-<div id=log></div>
-<script>
-async_test(t => {
-  const frame = document.createElement("iframe");
-  t.step_timeout(() => {
-    // Make sure the iframe didn't load.
-    assert_equals(frame.contentDocument, null);
-    t.done();
-  }, 500);
-  frame.src = "/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with anonymous policy: navigating a frame to a null policy should fail.");
-
-async_test(t => {
-  const frame = document.createElement("iframe");
-  let firstNavOk = false;
-  frame.onload = t.step_func(() => {
-    assert_not_equals(frame.contentDocument, null);
-    firstNavOk = true;
-  });
-  t.step_timeout(() => {
-    assert_equals(firstNavOk, true, "The initial load should work");
-    assert_equals(frame.contentDocument, null, "Navigation to null policy should fail");
-    t.done();
-  }, 500);
-  frame.src = "resources/navigate_anonymous.sub.html?to=/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with anonymous policy: navigating a frame from an anonymous policy to a null policy should fail.");
-
-
-async_test(t => {
-  const frame = document.createElement("iframe");
-  let firstNavOk = false;
-  frame.onload = t.step_func(() => {
-    assert_not_equals(frame.contentDocument, null);
-    firstNavOk = true;
-  });
-  t.step_timeout(() => {
-    assert_equals(firstNavOk, true, "The initial load should work");
-    assert_equals(frame.contentDocument, null, "Navigation to null policy should fail");
-    t.done();
-  }, 500);
-  frame.src = "resources/navigate_usecredentials.sub.html?to=/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with anonymous policy: navigating a frame from a use-credentials policy to a null policy should fail.");
-
-async_test(t => {
-  let pageLoaded = false;
-  const CHANNEL_NAME = "anon-null-window-noopener";
-  let bc = new BroadcastChannel(CHANNEL_NAME);
-  let finished = false;
-  bc.onmessage = t.step_func((event) => {
-    pageLoaded = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  let win = window.open(`resources/navigate_null.sub.html?channelName=${CHANNEL_NAME}&to=/common/blank.html`, "_blank", "noopener");
-
-  t.step_timeout(() => {
-    assert_equals(pageLoaded, true, "Opening a null window (noopener) from anon window should work");
-    t.done();
-  }, 500);
-}, "Top-level with anonymous policy: creating a noopener popup with null policy should work.");
-
-async_test(t => {
-  let pageLoaded = false;
-  const CHANNEL_NAME = "anon-null-window";
-  let bc = new BroadcastChannel(CHANNEL_NAME);
-  bc.onmessage = t.step_func_done((event) => {
-    pageLoaded = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  let win = window.open(`resources/navigate_null.sub.html?channelName=${CHANNEL_NAME}&to=/common/blank.html`, "_blank");
-  t.add_cleanup(() => win.close());
-  t.step_timeout(() => {
-    assert_equals(pageLoaded, false, "Opening a null window from anon window should fail");
-    t.done();
-  }, 500);
-}, "Top-level with anonymous policy: creating a popup with null policy should fail.");
-
-async_test(t => {
-  let pageLoaded = false;
-  const CHANNEL_NAME = "anon-null-top-navigation";
-  let bc = new BroadcastChannel(CHANNEL_NAME);
-  let finished = false;
-  bc.onmessage = t.step_func((event) => {
-    pageLoaded = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  const SECOND_CHANNEL = "anon-null-top-navigation-final";
-  let bc2 = new BroadcastChannel(SECOND_CHANNEL);
-  bc2.onmessage = t.step_func((event) => {
-    finished = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  let win = window.open(`resources/navigate_anonymous.sub.html?channelName=${CHANNEL_NAME}&to=navigate_null.sub.html?channelName=${SECOND_CHANNEL}`, "_blank", "noopener");
-
-  t.step_timeout(() => {
-    assert_equals(pageLoaded, true, "Opening a null window (noopener) from anon window should work");
-    assert_equals(finished, true, "Navigating a top level window out of an anonymous policy should work");
-    t.done();
-  }, 1500);
-}, "Top-level noopener with anonymous policy: navigating to a different policy should work");
-
-promise_test(t => {
-  let host_info = get_host_info();
-  return fetch(host_info.HTTP_REMOTE_ORIGIN+"/html/cross-origin/resources/nothing.txt",
-        {"mode": "no-cors", "method": "GET", "headers":{}}).then(r => {
-    assert_equals(r.type, "cors", "type should have been changed to cors");
-  });
-}, "Fetch policy: anonymous policy no-cors fetches should be changed to cors");
-
-
-async_test(t => {
-  let pageLoaded = false;
-  const CHANNEL_NAME = "anon-null-window";
-  let bc = new BroadcastChannel(CHANNEL_NAME);
-  bc.onmessage = t.step_func_done((event) => {
-    pageLoaded = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  const SECOND_CHANNEL = "anon-null-window-second";
-  let navigated = false;
-  let bc2 = new BroadcastChannel(SECOND_CHANNEL);
-  bc2.onmessage = t.step_func((event) => {
-    navigated = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  let win = window.open(`resources/navigate_anonymous.sub.html?channelName=${CHANNEL_NAME}&to=navigate_null.sub.html?channelName=${SECOND_CHANNEL}`, "_blank");
-  t.add_cleanup(() => win.close());
-  t.step_timeout(() => {
-    assert_equals(pageLoaded, true, "Opening the popup window from anon window should work");
-    assert_equals(navigated, false, "Navigating the popup to a null policy should fail");
-    t.done();
-  }, 500);
-}, "Top-level popup with anonymous policy: Navigating the popup to a null policy should fail.");
-
-async_test(t => {
-  let pageLoaded = false;
-  const CHANNEL_NAME = "anon-null-window";
-  let bc = new BroadcastChannel(CHANNEL_NAME);
-  bc.onmessage = t.step_func_done((event) => {
-    pageLoaded = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  const SECOND_CHANNEL = "anon-null-window-second";
-  let navigated = false;
-  let bc2 = new BroadcastChannel(SECOND_CHANNEL);
-  bc2.onmessage = t.step_func((event) => {
-    navigated = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  let win = window.open(`resources/navigate_anonymous.sub.html?clearOpener=true&channelName=${CHANNEL_NAME}&to=navigate_null.sub.html?channelName=${SECOND_CHANNEL}`, "_blank");
-  t.add_cleanup(() => win.close());
-  t.step_timeout(() => {
-    assert_equals(pageLoaded, true, "Opening the popup window from anon window should work");
-    assert_equals(navigated, false, "Navigating the popup to a null policy should fail");
-    t.done();
-  }, 500);
-}, "Top-level popup with anonymous policy: Navigating the popup to a null policy should fail. (even when we clear the opener)");
-
-async_test(t => {
-  let pageLoaded = false;
-  let popupLoaded = false;
-  const CHANNEL_NAME = "anon-null-window-no-opener";
-  let bc = new BroadcastChannel(CHANNEL_NAME);
-  bc.onmessage = t.step_func_done((event) => {
-    pageLoaded = true;
-    let payload = event.data;
-    if (payload == "loaded") {
-      pageLoaded = true;
-    } else if (payload == "popup-loaded") {
-      popupLoaded = true;
-    } else {
-      assert_unreached(`unexpected payload ${payload}`);
-    }
-  });
-
-  const SECOND_CHANNEL = "anon-null-window-second-popup";
-  let navigated = false;
-  let bc2 = new BroadcastChannel(SECOND_CHANNEL);
-  bc2.onmessage = t.step_func((event) => {
-    navigated = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  let win = window.open(`resources/popup_and_close.sub.html?channelName=${CHANNEL_NAME}&to=navigate_null.sub.html?channelName=${SECOND_CHANNEL}`, "_blank", "noopener");
-  t.step_timeout(() => {
-    assert_equals(popupLoaded, true, "Opening the popup window (noopener) from anon window should work");
-    assert_equals(pageLoaded, true, "Opening the popup window from anon window should work");
-    assert_equals(navigated, false, "Navigating the popup to a null policy should fail");
-    t.done();
-  }, 1000);
-}, "Top-level popup with anonymous policy: Navigating the popup to a null policy should fail. (even opener window is closed)");
-
-
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/anonymous.tentative.html.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Cross-Origin: anonymous
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/null.tentative.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!doctype html>
-<meta name="timeout" content="long">
-<title>Cross-Origin header and nested navigable resource without such header</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/get-host-info.sub.js"></script>
-<div id=log></div>
-<script>
-async_test(t => {
-  const frame = document.createElement("iframe");
-  frame.onload = t.step_func_done(() => {
-    assert_not_equals(frame.contentDocument, null, "The frame should actually load");
-  });
-  frame.src = "/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with null policy: navigating a frame to a null policy should work.");
-
-async_test(t => {
-  const frame = document.createElement("iframe");
-  let firstNavOk = false;
-  frame.onload = t.step_func(() => {
-    assert_not_equals(frame.contentDocument, null);
-    firstNavOk = true;
-  });
-  t.step_timeout(() => {
-    assert_equals(firstNavOk, true, "The initial load should work");
-    assert_not_equals(frame.contentDocument, null, "Navigation to null policy should fail");
-    t.done();
-  }, 500);
-  frame.src = "resources/navigate_anonymous.sub.html?to=/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with null policy: parent policy should apply to frame navigation from use-credentials policy to a null. Should succeed.");
-
-async_test(t => {
-  const frame = document.createElement("iframe");
-  let firstNavOk = false;
-  frame.onload = t.step_func(() => {
-    assert_not_equals(frame.contentDocument, null);
-    firstNavOk = true;
-  });
-  t.step_timeout(() => {
-    assert_equals(firstNavOk, true, "The initial load should work");
-    assert_not_equals(frame.contentDocument, null, "Navigation to null policy should fail");
-    t.done();
-  }, 500);
-  frame.src = "resources/navigate_anonymous.sub.html?to=/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with null policy: parent policy should apply to frame navigation from anonymous policy to a null. Should succeed.");
-
-async_test(t => {
-  let w = window.open(`resources/navigate_null.sub.html?to=navigate_anonymous.sub.html`, "window_name");
-
-  t.add_cleanup(() => w.close());
-
-  t.step_timeout(() => {
-    w.history.back();
-    t.step_timeout(() => {
-      assert_not_equals(w.document, null);
-      t.done();
-    }, 500);
-  }, 500);
-}, "Top-level with null policy: navigating a frame back from a blocked page should work.");
-
-async_test(t => {
-  let pageLoaded = false;
-  const CHANNEL_NAME = "usecredentials-null-top-navigation";
-  let bc = new BroadcastChannel(CHANNEL_NAME);
-  let finished = false;
-  bc.onmessage = t.step_func((event) => {
-    pageLoaded = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  const SECOND_CHANNEL = "usecredentials-null-top-navigation-final";
-  let bc2 = new BroadcastChannel(SECOND_CHANNEL);
-  bc2.onmessage = t.step_func((event) => {
-    finished = true;
-    let payload = event.data;
-    assert_equals(payload, "loaded");
-  });
-
-  let win = window.open(`resources/navigate_usecredentials.sub.html?channelName=${CHANNEL_NAME}&to=navigate_null.sub.html?channelName=${SECOND_CHANNEL}`, "_blank", "noopener");
-
-  t.step_timeout(() => {
-    assert_equals(pageLoaded, true, "Opening a null window (noopener) from usecredentials window should work");
-    assert_equals(finished, true, "Navigating a top level window out of an usecredentials policy should work");
-    t.done();
-  }, 500);
-}, "Top-level noopener popup with use-credentials policy: navigating to a different (null) policy should work");
-
-promise_test(t => {
-  let host_info = get_host_info();
-  return fetch(host_info.HTTP_REMOTE_ORIGIN+"/html/cross-origin/resources/nothing.txt",
-        {"mode": "no-cors", "method": "GET", "headers":{}}).then(r => {
-    assert_equals(r.type, "opaque", "type should be opaque for cross origin fetch");
-  });
-}, "Fetch policy: null policy should not affect the no-cors mode");
-
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/null.tentative.html.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Cross-Origin: unknown-should-be-parsed-as-null
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/navigate_anonymous.sub.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!doctype html>
-<script>
-  let current = new URL(window.location.href);
-  let navigateTo = current.searchParams.get("to");
-  let channelName = current.searchParams.get("channelName");
-  let clearOpener = current.searchParams.get("clearOpener");
-
-  if (clearOpener) {
-    window.opener = null;
-  }
-
-  current.search = "";
-  if (navigateTo) {
-    let next = new URL(navigateTo, current);
-    setTimeout(() => {
-      window.location = next.href;
-    }, 50);
-  }
-
-  if (channelName) {
-    let bc = new BroadcastChannel(channelName);
-    bc.postMessage("loaded");
-  }
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/navigate_anonymous.sub.html.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Cross-Origin: anonymous
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/navigate_null.sub.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<script>
-  let current = new URL(window.location.href);
-  let navigateTo = current.searchParams.get("to");
-  let channelName = current.searchParams.get("channelName");
-  current.search = "";
-  if (navigateTo) {
-    let next = new URL(navigateTo, current);
-    setTimeout(() => {
-      window.location = next.href;
-    }, 50);
-  }
-
-  if (channelName) {
-    let bc = new BroadcastChannel(channelName);
-    bc.postMessage("loaded");
-  }
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/navigate_usecredentials.sub.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<script>
-  let current = new URL(window.location.href);
-  let navigateTo = current.searchParams.get("to");
-  let channelName = current.searchParams.get("channelName");
-  current.search = "";
-  if (navigateTo) {
-    let next = new URL(navigateTo, current);
-    setTimeout(() => {
-      window.location = next.href;
-    }, 50);
-  }
-
-  if (channelName) {
-    let bc = new BroadcastChannel(channelName);
-    bc.postMessage("loaded");
-  }
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/navigate_usecredentials.sub.html.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Cross-Origin: use-credentials
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/nothing.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-nothing
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/nothing.txt.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Access-Control-Allow-Origin: *
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/popup_and_close.sub.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<script>
-  let current = new URL(window.location.href);
-  let navigateTo = current.searchParams.get("to");
-  let channelName = current.searchParams.get("channelName");
-  let secondChannel = current.searchParams.get("secondChannel");
-
-  if (channelName) {
-    let bc = new BroadcastChannel(channelName);
-    bc.postMessage("popup-loaded");
-  }
-
-  let win = window.open(`navigate_anonymous.sub.html?channelName=${channelName}&to=navigate_null.sub.html?channelName=${secondChannel}`, "_blank");
-
-  setTimeout(() => {
-    window.close();
-  }, 10);
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/resources/popup_and_close.sub.html.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Cross-Origin: anonymous
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/usecredentials.tentative.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!doctype html>
-<meta name="timeout" content="long">
-<title>Cross-Origin header and nested navigable resource without such header</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-async_test(t => {
-  const frame = document.createElement("iframe");
-  t.step_timeout(() => {
-    // Make sure the iframe didn't load.
-    assert_equals(frame.contentDocument, null);
-    t.done();
-  }, 500);
-  frame.src = "/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with use-credentials policy: navigating a frame to a null policy should fail.");
-
-async_test(t => {
-  const frame = document.createElement("iframe");
-  let firstNavOk = false;
-  frame.onload = t.step_func(() => {
-    assert_not_equals(frame.contentDocument, null);
-    firstNavOk = true;
-  });
-  t.step_timeout(() => {
-    assert_equals(firstNavOk, true, "The initial load should work");
-    assert_equals(frame.contentDocument, null, "Navigation to null policy should fail");
-    t.done();
-  }, 500);
-  frame.src = "resources/navigate_usecredentials.sub.html?to=/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with use-credentials policy: navigating a frame from a use-credentials policy to a null policy should fail");
-
-async_test(t => {
-  const frame = document.createElement("iframe");
-  let firstNavOk = false;
-  frame.onload = t.step_func(() => {
-    assert_not_equals(frame.contentDocument, null);
-    firstNavOk = true;
-  });
-  t.step_timeout(() => {
-    assert_equals(firstNavOk, true, "The initial load should work");
-    assert_equals(frame.contentDocument, null, "Navigation to null policy should fail");
-    t.done();
-  }, 500);
-  frame.src = "resources/navigate_anonymous.sub.html?to=/common/blank.html";
-  document.body.append(frame);
-  assert_equals(frame.contentDocument.body.localName, "body");
-}, "Top-level with use-credentials policy: navigating a frame from an anonymous policy to a null policy should fail.");
-
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/html/cross-origin/usecredentials.tentative.html.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Cross-Origin: use-credentials
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -158,17 +158,16 @@ SET TIMEOUT: html/browsers/browsing-the-
 SET TIMEOUT: html/browsers/browsing-the-web/navigating-across-documents/*
 SET TIMEOUT: html/browsers/browsing-the-web/scroll-to-fragid/*
 SET TIMEOUT: html/browsers/browsing-the-web/unloading-documents/*
 SET TIMEOUT: html/browsers/history/the-history-interface/*
 SET TIMEOUT: html/browsers/history/the-location-interface/*
 SET TIMEOUT: html/browsers/history/the-session-history-of-browsing-contexts/*
 SET TIMEOUT: html/browsers/offline/*
 SET TIMEOUT: html/browsers/the-window-object/*
-SET TIMEOUT: html/cross-origin/resources/*
 SET TIMEOUT: html/editing/dnd/*
 SET TIMEOUT: html/semantics/embedded-content/the-iframe-element/*
 SET TIMEOUT: html/semantics/embedded-content/the-img-element/*
 SET TIMEOUT: html/semantics/scripting-1/the-script-element/*
 SET TIMEOUT: html/webappapis/dynamic-markup-insertion/opening-the-input-stream/0*
 SET TIMEOUT: html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/history-frame.html
 SET TIMEOUT: html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-timer-frame.html
 SET TIMEOUT: html/webappapis/dynamic-markup-insertion/opening-the-input-stream/tasks.window.js