[ServiceWorker] Refactor the codes for releasing the resources for st…

…reaming in ServiceWorkerURLRequestJob.

As michaeln@ mentioned in https://codereview.chromium.org/832813002/, Kill() may not be called and provider_host_ may be deleted before Kill() is called.
So this change
 - adds streaming_version_ property to ServiceWorkerURLRequestJob.
 - adds ClearStream() method to releases the resources for streaming.
 - calls ClearStream() from both Kill() and the destructor.

BUG=445775

Review URL: https://codereview.chromium.org/844913002

Cr-Commit-Position: refs/heads/master@{#310944}

content/browser/service_worker/service_worker_url_request_job.cc

@@ -83,21 +83,7 @@ void ServiceWorkerURLRequestJob::Start() {
 
 void ServiceWorkerURLRequestJob::Kill() {
   net::URLRequestJob::Kill();
-  if (stream_ || !waiting_stream_url_.is_empty()) {
-    if (ServiceWorkerVersion* active_version = provider_host_->active_version())
-      active_version->RemoveStreamingURLRequestJob(this);
-  }
-  if (stream_) {
-    stream_->RemoveReadObserver(this);
-    stream_->Abort();
-    stream_ = nullptr;
-  }
-  if (!waiting_stream_url_.is_empty()) {
-    StreamRegistry* stream_registry =
-        GetStreamContextForResourceContext(resource_context_)->registry();
-    stream_registry->RemoveRegisterObserver(waiting_stream_url_);
-    stream_registry->AbortPendingStream(waiting_stream_url_);
-  }
+  ClearStream();
   fetch_dispatcher_.reset();
   blob_request_.reset();
   weak_factory_.InvalidateWeakPtrs();
@@ -341,6 +327,7 @@ void ServiceWorkerURLRequestJob::GetExtraResponseInfo(
 
 
 ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() {
+  ClearStream();
 }
 
 void ServiceWorkerURLRequestJob::MaybeStartRequest() {
@@ -539,7 +526,8 @@ void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
   if (response.stream_url.is_valid()) {
     DCHECK(response.blob_uuid.empty());
     DCHECK(provider_host_->active_version());
-    provider_host_->active_version()->AddStreamingURLRequestJob(this);
+    streaming_version_ = provider_host_->active_version();
+    streaming_version_->AddStreamingURLRequestJob(this);
     response_url_ = response.url;
     service_worker_response_type_ = response.response_type;
     CreateResponseHeader(
@@ -619,4 +607,22 @@ void ServiceWorkerURLRequestJob::DeliverErrorResponse() {
   CommitResponseHeader();
 }
 
+void ServiceWorkerURLRequestJob::ClearStream() {
+  if (streaming_version_) {
+    streaming_version_->RemoveStreamingURLRequestJob(this);
+    streaming_version_ = nullptr;
+  }
+  if (stream_) {
+    stream_->RemoveReadObserver(this);
+    stream_->Abort();
+    stream_ = nullptr;
+  }
+  if (!waiting_stream_url_.is_empty()) {
+    StreamRegistry* stream_registry =
+        GetStreamContextForResourceContext(resource_context_)->registry();
+    stream_registry->RemoveRegisterObserver(waiting_stream_url_);
+    stream_registry->AbortPendingStream(waiting_stream_url_);
+  }
+}
+
 }  // namespace content

content/browser/service_worker/service_worker_url_request_job.h

@@ -41,6 +41,7 @@ class ResourceRequestBody;
 class ServiceWorkerContextCore;
 class ServiceWorkerFetchDispatcher;
 class ServiceWorkerProviderHost;
+class ServiceWorkerVersion;
 class Stream;
 
 class CONTENT_EXPORT ServiceWorkerURLRequestJob
@@ -159,6 +160,9 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob
   // Creates and commits a response header indicating error.
   void DeliverErrorResponse();
 
+  // Releases the resources for streaming.
+  void ClearStream();
+
   base::WeakPtr<ServiceWorkerProviderHost> provider_host_;
 
   // Timing info to show on the popup in Devtools' Network tab.
@@ -198,6 +202,7 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob
   // using the userdata mechanism. So we have to keep it not to free the blobs.
   scoped_refptr<ResourceRequestBody> body_;
   scoped_ptr<storage::BlobDataHandle> request_body_blob_data_handle_;
+  scoped_refptr<ServiceWorkerVersion> streaming_version_;
 
   base::WeakPtrFactory<ServiceWorkerURLRequestJob> weak_factory_;