S13nSW: Don't delete ServiceWorkerSubresourceLoader twice

Before this CL, DeleteSoon() could be called twice when a
connection error happens on |url_loader_binding_|.
- ServiceWorkerSubresourceLoader sets DeleteSoon() as the connection
  error handler.
- The class also calls DeleteSoon() when the loader is no longer needed.
  For example, it delete itself when a request falls back to network.

After this CL we just call delete directly as needed.
Existing DeleteSoon() is renamed to OnConnectionError() as it is only
used as the connection error handler.

Bug: 828257
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I85737d0d6c33b747a4f70f5156b2b3b4b512f873
Reviewed-on: https://chromium-review.googlesource.com/997256
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548708}

content/renderer/service_worker/service_worker_subresource_loader.cc

@@ -189,8 +189,9 @@ ServiceWorkerSubresourceLoader::ServiceWorkerSubresourceLoader(
   response_head_.load_timing.request_start = base::TimeTicks::Now();
   response_head_.load_timing.request_start_time = base::Time::Now();
   // base::Unretained() is safe since |url_loader_binding_| is owned by |this|.
-  url_loader_binding_.set_connection_error_handler(base::BindOnce(
-      &ServiceWorkerSubresourceLoader::DeleteSoon, base::Unretained(this)));
+  url_loader_binding_.set_connection_error_handler(
+      base::BindOnce(&ServiceWorkerSubresourceLoader::OnConnectionError,
+                     base::Unretained(this)));
   StartRequest(resource_request);
 }
 
@@ -198,8 +199,8 @@ ServiceWorkerSubresourceLoader::~ServiceWorkerSubresourceLoader() {
   SettleInflightFetchRequestIfNeeded();
 };
 
-void ServiceWorkerSubresourceLoader::DeleteSoon() {
-  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
+void ServiceWorkerSubresourceLoader::OnConnectionError() {
+  delete this;
 }
 
 void ServiceWorkerSubresourceLoader::StartRequest(
@@ -245,7 +246,7 @@ void ServiceWorkerSubresourceLoader::DispatchFetchEvent() {
           url_loader_binding_.Unbind(), routing_id_, request_id_, options_,
           resource_request_, std::move(url_loader_client_),
           traffic_annotation_);
-      DeleteSoon();
+      delete this;
       return;
     }
     DCHECK_EQ(ControllerServiceWorkerConnector::State::kNoContainerHost,
@@ -402,7 +403,7 @@ void ServiceWorkerSubresourceLoader::OnFallback(
       traffic_annotation_);
   // Per spec, redirects after this point are not intercepted by the service
   // worker again (https://crbug.com/517364). So this loader is done.
-  DeleteSoon();
+  delete this;
 }
 
 void ServiceWorkerSubresourceLoader::StartResponse(

content/renderer/service_worker/service_worker_subresource_loader.h

@@ -61,7 +61,7 @@ class CONTENT_EXPORT ServiceWorkerSubresourceLoader
  private:
   class StreamWaiter;
 
-  void DeleteSoon();
+  void OnConnectionError();
 
   void StartRequest(const network::ResourceRequest& resource_request);
   void DispatchFetchEvent();

third_party/WebKit/LayoutTests/FlagExpectations/enable-features=NetworkService

@@ -19,7 +19,6 @@ Bug(none) external/wpt/service-workers/service-worker/fetch-request-xhr-sync-on-
 crbug.com/771118 external/wpt/service-workers/service-worker/mime-sniffing.https.html [ Failure ]
 Bug(none) external/wpt/service-workers/service-worker/registration-updateviacache.https.html [ Failure Timeout ]
 Bug(none) external/wpt/service-workers/service-worker/shared-worker-controlled.https.html [ Timeout ]
-Bug(none) external/wpt/service-workers/service-worker/worker-interception.https.html [ Pass Crash Failure ]
 Bug(none) external/wpt/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html [ Failure ]
 Bug(none) external/wpt/service-workers/service-worker/ready.https.html [ Pass Crash Failure ]
 Bug(none) http/tests/appcache/top-frame-3.html [ Pass Timeout ]