Fail preflight request when redirect is received

LayoutTests/http/tests/fetch/script-tests/fetch.js

 if (self.importScripts) {
   importScripts('../resources/fetch-test-helpers.js');
 }
 
 promise_test(function(t) {
     return fetch('http://')
       .then(
         t.unreached_func('fetch of invalid URL must fail'),
         function() {});
   }, 'Fetch invalid URL');
@@ skipping 96 matching lines @@
     return fetch(request)
       .then(function(response) {
           assert_equals(response.status, 0);
           assert_equals(response.type, 'opaqueredirect');
           assert_equals(response.url, '');
         });
   }, 'Manual redirect fetch returns opaque redirect response');
 
 promise_test(function(t) {
     var redirect_target_url =
+      OTHER_ORIGIN + '/fetch/resources/fetch-status.php?status=200';
+    var redirect_original_url =
+      OTHER_ORIGIN + '/serviceworker/resources/redirect.php?Redirect=' +
+      redirect_target_url;
+
+    var request = new Request(redirect_original_url,
+                              {headers: [['X-Fetch-Test', 'A']],
+                               redirect: 'manual'});
+
+    // Cross-origin request with non-simple header initiates CORS preflight
+    // request.
+    return fetch(request)
+      .then(
+        t.unreached_func('Even in manual redirect mode, fetch with preflight' +
+                         ' must fail when redirect response is received'),
+        function() {});
+  }, 'Even in manual redirect mode, fetch with preflight must fail when' +
+     ' redirect response is received');
+
+promise_test(function(t) {
+    var redirect_target_url =
       BASE_ORIGIN + '/fetch/resources/fetch-status.php?status=200';
     var redirect_original_url =
       BASE_ORIGIN + '/serviceworker/resources/redirect.php?Redirect=' +
       redirect_target_url;
 
     var request = new Request(redirect_original_url, {redirect: 'error'});
     assert_equals(request.url, redirect_original_url,
       'Request\'s url is the original URL');
     assert_equals(request.redirect, 'error');
 
     return fetch(request)
       .then(
-        t.unreached_func('Redirect response must cause an error when redirct' +
+        t.unreached_func('Redirect response must cause an error when redirect' +
                          ' mode is error.'),
         function() {});
-  }, 'Redirect response must cause an error when redirct mode is error.');
+  }, 'Redirect response must cause an error when redirect mode is error.');
 
 promise_test(function(test) {
     var url = BASE_ORIGIN + '/fetch/resources/doctype.html';
     return fetch(new Request(url, {redirect: 'manual'}))
       .then(function(response) {
           assert_equals(response.status, 200);
           assert_equals(response.statusText, 'OK');
           assert_equals(response.url, url);
           return response.text();
         })
@@ skipping 123 matching lines @@
     function runInfiniteFetchLoop() {
       fetch('dummy.html')
         .then(function() { runInfiniteFetchLoop(); });
     }
     runInfiniteFetchLoop();
   },
   'Destroying the execution context while fetch is happening should not ' +
   'cause a crash.');
 
 done();