Merge to M58: Support redirect responses for NavigationPreload

content/browser/service_worker/service_worker_fetch_dispatcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 114 matching lines @@
         url_(request.url) {
     AddDevToolsCallback(
         base::Bind(&NotifyNavigationPreloadRequestSentOnUI, request));
   }
   ~DelegatingURLLoaderClient() override {
     if (!completed_) {
       // Let the service worker know that the request has been canceled.
       ResourceRequestCompletionStatus status;
       status.error_code = net::ERR_ABORTED;
       client_->OnComplete(status);
+      AddDevToolsCallback(
+          base::Bind(&NotifyNavigationPreloadCompletedOnUI, status));
     }
   }
 
   void MayBeReportToDevTools(WorkerId worker_id, int fetch_event_id) {
     worker_id_ = worker_id;
     devtools_request_id_ = base::StringPrintf("preload-%d", fetch_event_id);
     MayBeRunDevToolsCallbacks();
   }
 
   void OnDataDownloaded(int64_t data_length, int64_t encoded_length) override {
@@ skipping 14 matching lines @@
       const ResourceResponseHead& head,
       mojom::DownloadedTempFilePtr downloaded_file) override {
     client_->OnReceiveResponse(head, std::move(downloaded_file));
     DCHECK(on_response_);
     std::move(on_response_).Run();
     AddDevToolsCallback(
         base::Bind(&NotifyNavigationPreloadResponseReceivedOnUI, url_, head));
   }
   void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
                          const ResourceResponseHead& head) override {
+    completed_ = true;
+    // When the server returns a redirect response, we only send
+    // OnReceiveRedirect IPC and don't send OnComplete IPC. The service worker
+    // will clean up the preload request when OnReceiveRedirect() is called.
     client_->OnReceiveRedirect(redirect_info, head);
+    AddDevToolsCallback(
+        base::Bind(&NotifyNavigationPreloadResponseReceivedOnUI, url_, head));
+    ResourceRequestCompletionStatus status;
+    AddDevToolsCallback(
+        base::Bind(&NotifyNavigationPreloadCompletedOnUI, status));
   }
   void OnStartLoadingResponseBody(
       mojo::ScopedDataPipeConsumerHandle body) override {
     client_->OnStartLoadingResponseBody(std::move(body));
   }
   void OnComplete(
       const ResourceRequestCompletionStatus& completion_status) override {
+    if (completed_)
+      return;
+    completed_ = true;
     client_->OnComplete(completion_status);
-    completed_ = true;
     AddDevToolsCallback(
         base::Bind(&NotifyNavigationPreloadCompletedOnUI, completion_status));
   }
 
   void Bind(mojom::URLLoaderClientPtr* ptr_info) { binding_.Bind(ptr_info); }
 
  private:
   void MayBeRunDevToolsCallbacks() {
     if (!worker_id_)
       return;
@@ skipping 421 matching lines @@
     ServiceWorkerVersion* version,
     int event_finish_id,
     scoped_refptr<URLLoaderAssets> url_loader_assets,
     ServiceWorkerStatusCode status,
     base::Time dispatch_event_time) {
   version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
                          dispatch_event_time);
 }
 
 }  // namespace content