Merge to M58: Support redirect responses for NavigationPreload

third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp

Index: third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp b/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
index daff428240e0d65f92a89359812ebd42b6949755..00e32b0c8e9d84e7fde7c4074fcf3adccf1d62c2 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
@@ -12,6 +12,7 @@
 #include "modules/fetch/Response.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
+#include "platform/network/NetworkUtils.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerError.h"
 #include "wtf/PtrUtil.h"
@@ -132,7 +133,9 @@ void FetchEvent::onNavigationPreloadResponse(
     responseData->headerList()->append(header.key, header.value);
   }
   FetchResponseData* taintedResponse =
-      responseData->createBasicFilteredResponse();
+      NetworkUtils::isRedirectResponseCode(response->httpStatusCode())
+          ? responseData->createOpaqueRedirectFilteredResponse()
+          : responseData->createBasicFilteredResponse();
   m_preloadResponseProperty->resolve(
       Response::create(scriptState->getExecutionContext(), taintedResponse));
 }