Allow redirects for requests that require preflight.

third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js

Index: third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
diff --git a/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js b/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
index 7f33e95b817d440bddb5505df85ce0ef1982c2ce..606cfe4f9474cb82d9413e2d9164ac97a107f3b9 100644
--- a/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
+++ b/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
@@ -190,20 +190,22 @@ var TEST_TARGETS = [
   //  [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
   //  [methodIsPOST]],
 
-  // Once CORS preflight flag is set, redirecting to the cross-origin is not
-  // allowed.
-  // Custom method
   [OTHER_REDIRECT_URL +
    encodeURIComponent(BASE_URL + 'ACAOrigin=*&ACAMethods=PUT') +
    '&mode=cors&credentials=same-origin&method=PUT&ACAOrigin=*&ACAMethods=PUT',
-   [fetchRejected]],
+   [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+   [methodIsPUT, authCheckNone]],
   // Custom header
-  [OTHER_REDIRECT_URL +
-   encodeURIComponent(
-       BASE_URL +
-       'ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test') +
-   '&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM&ACAOrigin=*',
-   [fetchRejected]],
+  // FIXME: Disabled because Chromium currently drops custom headers when
+  // following cross-origin redirects. https://crbug.com/661782
+  //[OTHER_REDIRECT_URL +
+  // encodeURIComponent(
+  //     BASE_URL +
+  //     'ACAOrigin=*&ACAHeaders=x-serviceworker-test') +
+  // '&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM' +
+  // '&ACAOrigin=*&ACAHeaders=x-serviceworker-test',
+  // [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+  // [methodIsGET, hasCustomHeader, authCheckNone]],
 
   // Redirect: other origin -> other origin
   [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
@@ -272,21 +274,22 @@ var TEST_TARGETS = [
    [fetchResolved, noContentLength, hasServerHeader, hasBody, typeCors],
    [methodIsGET, authCheckNone]],
 
-  // Once CORS preflight flag is set, redirecting to the cross-origin is not
-  // allowed.
-  // Custom method
   [OTHER_REDIRECT_URL +
    encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*&ACAMethods=PUT') +
    '&mode=cors&credentials=same-origin&method=PUT&ACAOrigin=*&ACAMethods=PUT',
-   [fetchRejected]],
+   [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+   [methodIsPUT, authCheckNone]],
   // Custom header
-  [OTHER_REDIRECT_URL +
-   encodeURIComponent(
-     OTHER_BASE_URL +
-     'ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test') +
-   '&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM' +
-   '&ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test',
-   [fetchRejected]],
+  // FIXME: Disabled because Chromium currently drops custom headers when
+  // following cross-origin redirects. https://crbug.com/661782
+  //[OTHER_REDIRECT_URL +
+  // encodeURIComponent(
+  //   OTHER_BASE_URL +
+  //   'ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test') +
+  // '&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM' +
+  // '&ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test',
+  // [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+  // [methodIsGET, hasCustomHeader, authCheckNone]],
 ];
 
 if (self.importScripts) {