Merge to M58: Resolve preloadResponse of Navigation Preload even if the response body is empty.

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 babd858683d03a2c59cc7499b4e784554a2dbe72..93873a0ea51e4e7b8231cda2ad62f9a45f82277a 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -276,8 +276,7 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
         url_loader_(std::move(preload_handle->url_loader)),
         binding_(this, std::move(preload_handle->url_loader_client_request)) {}
 
-  ~NavigationPreloadRequest() override {
-  }
+  ~NavigationPreloadRequest() override {}
 
   void OnReceiveResponse(
       const ResourceResponseHead& response_head,
@@ -333,6 +332,13 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
         ServiceWorkerContextClient::ThreadSpecificInstance();
     if (!client)
       return;
+    if (response_) {
+      // When the response body from the server is empty, OnComplete() is called
+      // without OnStartLoadingResponseBody().
+      DCHECK(!body_.is_valid());
+      client->OnNavigationPreloadResponse(fetch_event_id_, std::move(response_),
+                                          nullptr);
+    }
     // This will delete |this|.
     client->OnNavigationPreloadComplete(fetch_event_id_);
   }