Move tests for sendBeacon to a separate dedicated directory for clear…

…er ownership Not only because of the ownership clarification, but it's just good to have a better home for them since they're closer to XHR and Fetch API. It's not so reasonable to place them in navigation/ just because they belongs to window.navigator. The virtual test virtual/stable/http/tests/navigation/ is kept for a different reason. Moved redirection-respond.php to http/tests/resources as it's not specific to the tests under http/tests/navigation/ BUG=682571,619662,490015,694958 Review-Url: https://codereview.chromium.org/2702113003 Cr-Commit-Position: refs/heads/master@{#452408}
Denger-Network · Feb 23, 2017 · 8a75af1 · 8a75af1
1 parent 645ad78
commit 8a75af1
Show file tree

Hide file tree

Showing 34 changed files with 78 additions and 71 deletions.
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1839,13 +1839,13 @@ crbug.com/638618 inspector/editor/text-editor-search-switch-editor.html [ Skip ]
 
 # This test breaks when the feature introduced in the bug is enabled. We keep
 # this tested without the feature by using the virtual test. See
-# virtual/stable/http/tests/navigation/beacon-cross-origin-redirect-blob-expected.txt
-crbug.com/490015 http/tests/navigation/beacon-cross-origin-redirect-blob.html [ Skip ]
-crbug.com/490015 virtual/mojo-loading/http/tests/navigation/beacon-cross-origin-redirect-blob.html [ Skip ]
+# virtual/stable/http/tests/sendbeacon/beacon-cross-origin-redirect-blob-expected.txt
+crbug.com/490015 http/tests/sendbeacon/beacon-cross-origin-redirect-blob.html [ Skip ]
+crbug.com/490015 virtual/mojo-loading/http/tests/sendbeacon/beacon-cross-origin-redirect-blob.html [ Skip ]
 # This test doesn't need to be run with the stable release mode.
-crbug.com/490015 virtual/stable/http/tests/navigation/beacon-blob-with-non-simple-type.html [ Skip ]
+crbug.com/490015 virtual/stable/http/tests/sendbeacon/beacon-blob-with-non-simple-type.html [ Skip ]
 # This test fails with the stable release mode.
-crbug.com/490015 virtual/stable/http/tests/navigation/same-and-different-back.html [ Skip ]
+crbug.com/694958 virtual/stable/http/tests/navigation/same-and-different-back.html [ Skip ]
 
 # These tests have console error messages whose order is not deterministic.
 crbug.com/685778 http/tests/dom/promise-rejection-events.html [ Pass Failure ]

diff --git a/third_party/WebKit/LayoutTests/VirtualTestSuites b/third_party/WebKit/LayoutTests/VirtualTestSuites
@@ -88,6 +88,11 @@
     "base": "http/tests/navigation",
     "args": ["--stable-release-mode"]
   },
+  {
+    "prefix": "stable",
+    "base": "http/tests/sendbeacon",
+    "args": ["--stable-release-mode"]
+  },
   {
     "prefix": "stable",
     "base": "animations-unprefixed",

diff --git a/..._party/WebKit/LayoutTests/http/tests/navigation/beacon-cross-origin-redirect-expected.txt b/..._party/WebKit/LayoutTests/http/tests/navigation/beacon-cross-origin-redirect-expected.txt
diff --git a/third_party/WebKit/LayoutTests/http/tests/navigation/post-301-response.html b/third_party/WebKit/LayoutTests/http/tests/navigation/post-301-response.html
@@ -11,7 +11,7 @@
 </script>
 </head>
 <body onload="doTest()">
-<form id="form1" action="resources/redirection-response.php?status=301&target=redirected-post-request-contents.php?content=false" method="post">
+<form id="form1" action="../resources/redirection-response.php?status=301&target=/navigation/resources/redirected-post-request-contents.php?content=false" method="post">
 <input type="text" name="text1" value="some text"><br>
 </form>
 </body>

diff --git a/third_party/WebKit/LayoutTests/http/tests/navigation/post-302-response.html b/third_party/WebKit/LayoutTests/http/tests/navigation/post-302-response.html
@@ -11,7 +11,7 @@
 </script>
 </head>
 <body onload="doTest()">
-<form id="form1" action="resources/redirection-response.php?status=302&target=redirected-post-request-contents.php?content=false" method="post">
+<form id="form1" action="../resources/redirection-response.php?status=302&target=/navigation/resources/redirected-post-request-contents.php?content=false" method="post">
 <input type="text" name="text1" value="some text"><br>
 </form>
 </body>

diff --git a/third_party/WebKit/LayoutTests/http/tests/navigation/post-303-response.html b/third_party/WebKit/LayoutTests/http/tests/navigation/post-303-response.html
@@ -11,7 +11,7 @@
 </script>
 </head>
 <body onload="doTest()">
-<form id="form1" action="resources/redirection-response.php?status=303&target=redirected-post-request-contents.php?content=false" method="post">
+<form id="form1" action="../resources/redirection-response.php?status=303&target=/navigation/resources/redirected-post-request-contents.php?content=false" method="post">
 <input type="text" name="text1" value="some text"><br>
 </form>
 </body>

diff --git a/third_party/WebKit/LayoutTests/http/tests/navigation/post-307-response.html b/third_party/WebKit/LayoutTests/http/tests/navigation/post-307-response.html
@@ -11,7 +11,7 @@
 </script>
 </head>
 <body onload="doTest()">
-<form id="form1" action="resources/redirection-response.php?status=307&target=redirected-post-request-contents.php?content=true" method="post">
+<form id="form1" action="../resources/redirection-response.php?status=307&target=/navigation/resources/redirected-post-request-contents.php?content=true" method="post">
 <input type="text" name="text1" value="some text"><br>
 </form>
 </body>

diff --git a/...gation/resources/redirection-response.php → .../tests/resources/redirection-response.php b/...gation/resources/redirection-response.php → .../tests/resources/redirection-response.php
@@ -1,7 +1,6 @@
 <?php
 $status_code = $_GET['status'];
-
-$uri = rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/" . $_GET['target'];
+$target_path = $_GET['target'];
 
 $host = $_SERVER['HTTP_HOST'];
 if (isset($_GET['host']))
@@ -10,19 +9,19 @@
 switch ($status_code) {
     case 301:
         header("HTTP/1.1 301 Moved Permanently");
-        header("Location: http://" . $host . $uri);
+        header("Location: http://" . $host . $target_path);
         break;
     case 302:
         header("HTTP/1.1 302 Found");
-        header("Location: http://" . $host . $uri);
+        header("Location: http://" . $host . $target_path);
         break;
     case 303:
         header("HTTP/1.1 303 See Other");
-        header("Location: http://" . $host . $uri);
+        header("Location: http://" . $host . $target_path);
         break;
     case 307:
         header("HTTP/1.1 307 Temporary Redirect");
-        header("Location: http://" . $host . $uri);
+        header("Location: http://" . $host . $target_path);
         break;
     default:
         header("HTTP/1.1 500 Internal Server Error");

diff --git a/...Tests/http/tests/security/contentSecurityPolicy/1.1/form-action-src-redirect-blocked.html b/...Tests/http/tests/security/contentSecurityPolicy/1.1/form-action-src-redirect-blocked.html
@@ -20,7 +20,7 @@
 </script>
 </head>
 <body>
-    <form id="form1" action="/navigation/resources/redirection-response.php?host=localhost:8000&status=302&target=form-target.pl" method="post">
+    <form id="form1" action="/resources/redirection-response.php?host=localhost:8000&status=302&target=/navigation/resources/form-target.pl" method="post">
         <input type='text' name='fieldname' value='fieldvalue'>
         <input type='submit' id='submit' value='submit'>
     </form>

diff --git a/.../tests/security/contentSecurityPolicy/connect-src-beacon-redirect-to-blocked-expected.txt b/.../tests/security/contentSecurityPolicy/connect-src-beacon-redirect-to-blocked-expected.txt
@@ -3,7 +3,7 @@ Verify that a CSP connect-src directive blocks redirects.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS navigator.sendBeacon("resources/redir.php?url=http://127.0.0.1:8080/navigation/resources/save-beacon.php%3Fname%3Dcsp-redirect-blocked", "ping"); is true
+PASS navigator.sendBeacon("resources/redir.php?url=http://127.0.0.1:8080/sendbeacon/resources/save-beacon.php%3Fname%3Dcsp-redirect-blocked", "ping"); is true
 PASS Beacon sent successfully
 PASS Content-Type: text/plain;charset=UTF-8
 PASS Origin: null

diff --git a/...sts/http/tests/security/contentSecurityPolicy/connect-src-beacon-redirect-to-blocked.html b/...sts/http/tests/security/contentSecurityPolicy/connect-src-beacon-redirect-to-blocked.html
@@ -9,11 +9,11 @@
 description("Verify that a CSP connect-src directive blocks redirects.");
 window.jsTestIsAsync = true;
 
-shouldBeTrue('navigator.sendBeacon("resources/redir.php?url=http://127.0.0.1:8080/navigation/resources/save-beacon.php%3Fname%3Dcsp-redirect-blocked", "ping");');
+shouldBeTrue('navigator.sendBeacon("resources/redir.php?url=http://127.0.0.1:8080/sendbeacon/resources/save-beacon.php%3Fname%3Dcsp-redirect-blocked", "ping");');
 
 function checkForBeacon() {
     var xhr = new XMLHttpRequest();
-    xhr.open("GET", "http://127.0.0.1:8000/navigation/resources/check-beacon.php?name=csp-redirect-blocked&retries=100", true);
+    xhr.open("GET", "http://127.0.0.1:8000/sendbeacon/resources/check-beacon.php?name=csp-redirect-blocked&retries=100", true);
     xhr.onload = function () {
         var lines = xhr.responseText.split("\n");
         for (var i in lines)

diff --git a/.../navigation/beacon-allowance-expected.txt → .../sendbeacon/beacon-allowance-expected.txt b/.../navigation/beacon-allowance-expected.txt → .../sendbeacon/beacon-allowance-expected.txt
diff --git a/...tp/tests/navigation/beacon-allowance.html → ...tp/tests/sendbeacon/beacon-allowance.html b/...tp/tests/navigation/beacon-allowance.html → ...tp/tests/sendbeacon/beacon-allowance.html
diff --git a/...ion/beacon-blob-with-non-simple-type.html → ...con/beacon-blob-with-non-simple-type.html b/...ion/beacon-blob-with-non-simple-type.html → ...con/beacon-blob-with-non-simple-type.html
diff --git a/...sts/navigation/beacon-cookie-expected.txt → ...sts/sendbeacon/beacon-cookie-expected.txt b/...sts/navigation/beacon-cookie-expected.txt → ...sts/sendbeacon/beacon-cookie-expected.txt
@@ -1,5 +1,5 @@
 CONSOLE WARNING: line 18: Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help, check https://xhr.spec.whatwg.org/.
-PingLoader dispatched to 'http://127.0.0.1:8000/navigation/resources/save-beacon.php?name=cookie'.
+PingLoader dispatched to 'http://127.0.0.1:8000/sendbeacon/resources/save-beacon.php?name=cookie'.
 Checking transmission of Beacons involving cookies.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -10,7 +10,7 @@ PASS Beacon sent successfully
 PASS Content-Type: text/plain;charset=UTF-8
 PASS Cookie: hello=world
 PASS Origin: http://127.0.0.1:8000
-PASS Referer: http://127.0.0.1:8000/navigation/beacon-cookie.html
+PASS Referer: http://127.0.0.1:8000/sendbeacon/beacon-cookie.html
 PASS Request-Method: POST
 PASS Length: 4
 PASS Body: Blip

diff --git a/.../http/tests/navigation/beacon-cookie.html → .../http/tests/sendbeacon/beacon-cookie.html b/.../http/tests/navigation/beacon-cookie.html → .../http/tests/sendbeacon/beacon-cookie.html
diff --git a/...vigation/beacon-cross-origin-expected.txt → ...ndbeacon/beacon-cross-origin-expected.txt b/...vigation/beacon-cross-origin-expected.txt → ...ndbeacon/beacon-cross-origin-expected.txt
@@ -1,14 +1,14 @@
-PingLoader dispatched to 'http://localhost:8000/navigation/resources/save-beacon.php?name=cross-origin'.
+PingLoader dispatched to 'http://localhost:8000/sendbeacon/resources/save-beacon.php?name=cross-origin'.
 Testing navigator.sendBeacon() cross-origin.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS navigator.sendBeacon("http://localhost:8000/navigation/resources/save-beacon.php?name=cross-origin", "CrossOrigin"); is true
+PASS navigator.sendBeacon("http://localhost:8000/sendbeacon/resources/save-beacon.php?name=cross-origin", "CrossOrigin"); is true
 PASS Beacon sent successfully
 PASS Content-Type: text/plain;charset=UTF-8
 PASS Origin: http://127.0.0.1:8000
-PASS Referer: http://127.0.0.1:8000/navigation/beacon-cross-origin.html
+PASS Referer: http://127.0.0.1:8000/sendbeacon/beacon-cross-origin.html
 PASS Request-Method: POST
 PASS Length: 11
 PASS Body: CrossOrigin

diff --git a/...on/beacon-cross-origin-redirect-blob.html → ...on/beacon-cross-origin-redirect-blob.html b/...on/beacon-cross-origin-redirect-blob.html → ...on/beacon-cross-origin-redirect-blob.html
@@ -15,11 +15,12 @@
     }
 
     blob = new Blob(["Cross", "Origin"], {type: "text/plain;from-beacon=true"});
-    shouldBeTrue('navigator.sendBeacon("http://127.0.0.1:8080/navigation/resources/redirection-response.php?status=302&simple=true&target=non-existent.php", blob);');
+    // The "simple" parameter is just for differentiating the URLs.
+    shouldBeTrue('navigator.sendBeacon("http://127.0.0.1:8080/resources/redirection-response.php?status=302&simple=true&target=/non-existent.php", blob);');
     // Wait a while for the redirect response handling to happen before finishing up.
     setTimeout(function () {
         blob = new Blob([new Uint8Array(20)], {type: "application/octet-stream"});
-        shouldBeTrue('navigator.sendBeacon("http://127.0.0.1:8080/navigation/resources/redirection-response.php?status=302&simple=false&target=non-existent.php", blob);');
+        shouldBeTrue('navigator.sendBeacon("http://127.0.0.1:8080/resources/redirection-response.php?status=302&simple=false&target=/non-existent.php", blob);');
         setTimeout(finishJSTest, 200);
     }, 200);
 }

diff --git a/...on-cross-origin-redirect-credentials.html → ...on-cross-origin-redirect-credentials.html b/...on-cross-origin-redirect-credentials.html → ...on-cross-origin-redirect-credentials.html
@@ -81,7 +81,7 @@
 
 promise_test(() => {
   return run_test(
-      host_info['HTTP_REMOTE_ORIGIN'] + '/navigation/resources/save-beacon.php',
+      host_info['HTTP_REMOTE_ORIGIN'] + '/sendbeacon/resources/save-beacon.php',
       301,
       {
         cookie: 'TestCookie=cross',
@@ -91,7 +91,7 @@
 
 promise_test(() => {
   return run_test(
-      host_info['HTTP_REMOTE_ORIGIN'] + '/navigation/resources/save-beacon.php',
+      host_info['HTTP_REMOTE_ORIGIN'] + '/sendbeacon/resources/save-beacon.php',
       302,
       {
         cookie: 'TestCookie=cross',
@@ -101,7 +101,7 @@
 
 promise_test(() => {
   return run_test(
-      host_info['HTTP_REMOTE_ORIGIN'] + '/navigation/resources/save-beacon.php',
+      host_info['HTTP_REMOTE_ORIGIN'] + '/sendbeacon/resources/save-beacon.php',
       303,
       {
         cookie: 'TestCookie=cross',
@@ -111,7 +111,7 @@
 
 promise_test(() => {
   return run_test(
-      host_info['HTTP_REMOTE_ORIGIN'] + '/navigation/resources/save-beacon.php',
+      host_info['HTTP_REMOTE_ORIGIN'] + '/sendbeacon/resources/save-beacon.php',
       307,
       {
         cookie: 'TestCookie=cross',

diff --git a/..._party/WebKit/LayoutTests/http/tests/sendbeacon/beacon-cross-origin-redirect-expected.txt b/..._party/WebKit/LayoutTests/http/tests/sendbeacon/beacon-cross-origin-redirect-expected.txt
@@ -0,0 +1,11 @@
+PingLoader dispatched to 'http://127.0.0.1:8080/resources/redirection-response.php?status=302&target=/non-existent.php'.
+Verifying that navigator.sendBeacon() to non-CORS cross-origin redirect fails.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS navigator.sendBeacon("http://127.0.0.1:8080/resources/redirection-response.php?status=302&target=/non-existent.php", "CrossOrigin"); is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/...igation/beacon-cross-origin-redirect.html → ...dbeacon/beacon-cross-origin-redirect.html b/...igation/beacon-cross-origin-redirect.html → ...dbeacon/beacon-cross-origin-redirect.html
@@ -13,7 +13,7 @@
         testRunner.dumpPingLoaderCallbacks();
     }
 
-    shouldBeTrue('navigator.sendBeacon("http://127.0.0.1:8080/navigation/resources/redirection-response.php?status=302&target=non-existent.php", "CrossOrigin");');
+    shouldBeTrue('navigator.sendBeacon("http://127.0.0.1:8080/resources/redirection-response.php?status=302&target=/non-existent.php", "CrossOrigin");');
     // Wait a while for the redirect response handling to happen before finishing up.
     setTimeout(finishJSTest, 200);
 }

diff --git a/...tests/navigation/beacon-cross-origin.html → ...tests/sendbeacon/beacon-cross-origin.html b/...tests/navigation/beacon-cross-origin.html → ...tests/sendbeacon/beacon-cross-origin.html
@@ -14,7 +14,7 @@
         testRunner.dumpPingLoaderCallbacks();
     }
 
-    shouldBeTrue('navigator.sendBeacon("http://localhost:8000/navigation/resources/save-beacon.php?name=cross-origin", "CrossOrigin");');
+    shouldBeTrue('navigator.sendBeacon("http://localhost:8000/sendbeacon/resources/save-beacon.php?name=cross-origin", "CrossOrigin");');
     var xhr = new XMLHttpRequest();
     xhr.open("GET", "resources/check-beacon.php?name=cross-origin");
     xhr.onload = function () {

diff --git a/...on/beacon-cross-origin.https-expected.txt → ...on/beacon-cross-origin.https-expected.txt b/...on/beacon-cross-origin.https-expected.txt → ...on/beacon-cross-origin.https-expected.txt
@@ -1,10 +1,10 @@
-CONSOLE ERROR: line 1: Mixed Content: The page at 'https://127.0.0.1:8443/navigation/beacon-cross-origin.https.html' was loaded over HTTPS, but requested an insecure Beacon endpoint 'http://example.test:8000/navigation/resources/save-beacon.php?name=cross-origin'. This request has been blocked; the content must be served over HTTPS.
+CONSOLE ERROR: line 1: Mixed Content: The page at 'https://127.0.0.1:8443/sendbeacon/beacon-cross-origin.https.html' was loaded over HTTPS, but requested an insecure Beacon endpoint 'http://example.test:8000/sendbeacon/resources/save-beacon.php?name=cross-origin'. This request has been blocked; the content must be served over HTTPS.
 Verify navigator.sendBeacon() mixed content checking.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS navigator.sendBeacon("http://example.test:8000/navigation/resources/save-beacon.php?name=cross-origin", "CrossOrigin"); is false
+PASS navigator.sendBeacon("http://example.test:8000/sendbeacon/resources/save-beacon.php?name=cross-origin", "CrossOrigin"); is false
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/...navigation/beacon-cross-origin.https.html → ...sendbeacon/beacon-cross-origin.https.html b/...navigation/beacon-cross-origin.https.html → ...sendbeacon/beacon-cross-origin.https.html
@@ -13,7 +13,7 @@
         testRunner.waitUntilDone();
     }
 
-    shouldBeFalse('navigator.sendBeacon("http://example.test:8000/navigation/resources/save-beacon.php?name=cross-origin", "CrossOrigin");');
+    shouldBeFalse('navigator.sendBeacon("http://example.test:8000/sendbeacon/resources/save-beacon.php?name=cross-origin", "CrossOrigin");');
     finishJSTest();
 }
 </script>

diff --git a/...ion/beacon-detached-no-crash-expected.txt → ...con/beacon-detached-no-crash-expected.txt b/...ion/beacon-detached-no-crash-expected.txt → ...con/beacon-detached-no-crash-expected.txt
diff --git a/.../navigation/beacon-detached-no-crash.html → .../sendbeacon/beacon-detached-no-crash.html b/.../navigation/beacon-detached-no-crash.html → .../sendbeacon/beacon-detached-no-crash.html
diff --git a/...avigation/beacon-same-origin-expected.txt → ...endbeacon/beacon-same-origin-expected.txt b/...avigation/beacon-same-origin-expected.txt → ...endbeacon/beacon-same-origin-expected.txt
@@ -1,7 +1,7 @@
-PingLoader dispatched to 'http://127.0.0.1:8000/navigation/resources/save-beacon.php?name=same-origin'.
-PingLoader dispatched to 'http://127.0.0.1:8000/navigation/resources/save-beacon.php?name=same-origin'.
-PingLoader dispatched to 'http://127.0.0.1:8000/navigation/resources/save-beacon.php?name=same-origin'.
-PingLoader dispatched to 'http://127.0.0.1:8000/navigation/resources/save-beacon.php?name=same-origin'.
+PingLoader dispatched to 'http://127.0.0.1:8000/sendbeacon/resources/save-beacon.php?name=same-origin'.
+PingLoader dispatched to 'http://127.0.0.1:8000/sendbeacon/resources/save-beacon.php?name=same-origin'.
+PingLoader dispatched to 'http://127.0.0.1:8000/sendbeacon/resources/save-beacon.php?name=same-origin'.
+PingLoader dispatched to 'http://127.0.0.1:8000/sendbeacon/resources/save-beacon.php?name=same-origin'.
 Testing navigator.sendBeacon() within same origin.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -12,7 +12,7 @@ PASS navigator.sendBeacon("resources/save-beacon.php?name=same-origin", payload)
 PASS Beacon sent successfully
 PASS Content-Type: text/plain;charset=UTF-8
 PASS Origin: http://127.0.0.1:8000
-PASS Referer: http://127.0.0.1:8000/navigation/beacon-same-origin.html
+PASS Referer: http://127.0.0.1:8000/sendbeacon/beacon-same-origin.html
 PASS Request-Method: POST
 PASS Length: 10
 PASS Body: SameOrigin
@@ -22,7 +22,7 @@ PASS navigator.sendBeacon("resources/save-beacon.php?name=same-origin", payload)
 PASS Beacon sent successfully
 PASS Content-Type: application/octet-stream
 PASS Origin: http://127.0.0.1:8000
-PASS Referer: http://127.0.0.1:8000/navigation/beacon-same-origin.html
+PASS Referer: http://127.0.0.1:8000/sendbeacon/beacon-same-origin.html
 PASS Request-Method: POST
 PASS Length: 40
 PASS Body: QAAAAEEAAABCAAAAQwAAAEQAAABFAAAARgAAAEcAAABIAAAASQAAAA==
@@ -32,7 +32,7 @@ PASS navigator.sendBeacon("resources/save-beacon.php?name=same-origin", payload)
 PASS Beacon sent successfully
 PASS Content-Type: text/plain;from-beacon=true
 PASS Origin: http://127.0.0.1:8000
-PASS Referer: http://127.0.0.1:8000/navigation/beacon-same-origin.html
+PASS Referer: http://127.0.0.1:8000/sendbeacon/beacon-same-origin.html
 PASS Request-Method: POST
 PASS Length: 11
 PASS Body: hello world
@@ -42,7 +42,7 @@ PASS navigator.sendBeacon("resources/save-beacon.php?name=same-origin", payload)
 PASS Beacon sent successfully
 PASS Content-Type: multipart/form-data;
 PASS Origin: http://127.0.0.1:8000
-PASS Referer: http://127.0.0.1:8000/navigation/beacon-same-origin.html
+PASS Referer: http://127.0.0.1:8000/sendbeacon/beacon-same-origin.html
 PASS Request-Method: POST
 PASS Length: 9
 PASS Body: key=value

diff --git a/.../tests/navigation/beacon-same-origin.html → .../tests/sendbeacon/beacon-same-origin.html b/.../tests/navigation/beacon-same-origin.html → .../tests/sendbeacon/beacon-same-origin.html
diff --git a/...sts/navigation/resources/check-beacon.php → ...sts/sendbeacon/resources/check-beacon.php b/...sts/navigation/resources/check-beacon.php → ...sts/sendbeacon/resources/check-beacon.php
diff --git a/...ests/navigation/resources/save-beacon.php → ...ests/sendbeacon/resources/save-beacon.php b/...ests/navigation/resources/save-beacon.php → ...ests/sendbeacon/resources/save-beacon.php
diff --git a/third_party/WebKit/LayoutTests/virtual/stable/http/tests/navigation/README.txt b/third_party/WebKit/LayoutTests/virtual/stable/http/tests/navigation/README.txt
@@ -1,3 +1,2 @@
-This directory contains expectations to keep the sendBeacon tested both for
-the experimental web platform features flag turned on and off until
-http://crbug.com/490015 is resolved.
+This directory contains expectations to keep the navigation logic tested both
+when the --site-per-proces flag turned on and off. See http://crbug.com/619662.
diff --git a/...Tests/virtual/stable/http/tests/navigation/beacon-cross-origin-redirect-blob-expected.txt b/...Tests/virtual/stable/http/tests/navigation/beacon-cross-origin-redirect-blob-expected.txt
diff --git a/third_party/WebKit/LayoutTests/virtual/stable/http/tests/sendbeacon/README.txt b/third_party/WebKit/LayoutTests/virtual/stable/http/tests/sendbeacon/README.txt
@@ -0,0 +1,3 @@
+This directory contains expectations to keep the sendBeacon tested both for
+the experimental web platform features flag turned on and off until
+http://crbug.com/490015 is resolved.
diff --git a/...Tests/virtual/stable/http/tests/sendbeacon/beacon-cross-origin-redirect-blob-expected.txt b/...Tests/virtual/stable/http/tests/sendbeacon/beacon-cross-origin-redirect-blob-expected.txt
@@ -0,0 +1,14 @@
+PingLoader dispatched to 'http://127.0.0.1:8080/resources/redirection-response.php?status=302&simple=true&target=/non-existent.php'.
+PingLoader dispatched to 'http://127.0.0.1:8080/resources/redirection-response.php?status=302&simple=false&target=/non-existent.php'.
+CONSOLE ERROR: Redirect from 'http://127.0.0.1:8080/resources/redirection-response.php?status=302&simple=false&target=/non-existent.php' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access.
+Verifying navigator.sendBeacon(Blob) non-CORS cross-origin redirect handling.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS navigator.sendBeacon("http://127.0.0.1:8080/resources/redirection-response.php?status=302&simple=true&target=/non-existent.php", blob); is true
+PASS navigator.sendBeacon("http://127.0.0.1:8080/resources/redirection-response.php?status=302&simple=false&target=/non-existent.php", blob); is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+