Merge to M58: Support redirect responses for NavigationPreload

content/renderer/service_worker/service_worker_context_client.cc

Index: content/renderer/service_worker/service_worker_context_client.cc
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index 93873a0ea51e4e7b8231cda2ad62f9a45f82277a..31ab5576d7549982d7733d99b05877fd90100ae8 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -51,6 +51,7 @@
 #include "content/renderer/service_worker/service_worker_type_util.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
+#include "net/http/http_response_headers.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
@@ -293,9 +294,21 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
 
   void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
                          const ResourceResponseHead& response_head) override {
+    DCHECK(!response_);
+    DCHECK(net::HttpResponseHeaders::IsRedirectResponseCode(
+        response_head.headers->response_code()));
+
+    ServiceWorkerContextClient* client =
+        ServiceWorkerContextClient::ThreadSpecificInstance();
+    if (!client)
+      return;
+    response_ = base::MakeUnique<blink::WebURLResponse>();
+    WebURLLoaderImpl::PopulateURLResponse(url_, response_head, response_.get(),
+                                          false /* report_security_info */);
+    client->OnNavigationPreloadResponse(fetch_event_id_, std::move(response_),
+                                        nullptr);
     // This will delete |this|.
-    ReportErrorToClient(
-        "Service Worker navigation preload doesn't support redirects.");
+    client->OnNavigationPreloadComplete(fetch_event_id_);
   }
 
   void OnDataDownloaded(int64_t data_length,