Small fixes for Servicified SW code path

content/browser/service_worker/service_worker_url_loader_job.cc

Index: content/browser/service_worker/service_worker_url_loader_job.cc
diff --git a/content/browser/service_worker/service_worker_url_loader_job.cc b/content/browser/service_worker/service_worker_url_loader_job.cc
index 7364bc16ddd70affe265ea0a4ad3a788f8fd30d3..7d1ecf229e8c9c409e19a1dd0abeeaebb7216197 100644
--- a/content/browser/service_worker/service_worker_url_loader_job.cc
+++ b/content/browser/service_worker/service_worker_url_loader_job.cc
@@ -4,13 +4,11 @@
 
 #include "content/browser/service_worker/service_worker_url_loader_job.h"
 
-#include "base/command_line.h"
 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
-#include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/io_buffer.h"
 #include "storage/browser/blob/blob_reader.h"
@@ -29,9 +27,7 @@ ServiceWorkerURLLoaderJob::ServiceWorkerURLLoaderJob(
       blob_storage_context_(blob_storage_context),
       binding_(this),
       weak_factory_(this) {
-  DCHECK(IsBrowserSideNavigationEnabled() &&
-         base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kEnableNetworkService));
+  DCHECK(ServiceWorkerUtils::IsServicificationEnabled());
 }
 
 ServiceWorkerURLLoaderJob::~ServiceWorkerURLLoaderJob() {}
@@ -76,6 +72,10 @@ void ServiceWorkerURLLoaderJob::FailDueToLostController() {
 
 void ServiceWorkerURLLoaderJob::Cancel() {
   canceled_ = true;
+  weak_factory_.InvalidateWeakPtrs();
+  blob_reader_.reset();
+  blob_storage_context_.reset();
+  fetch_dispatcher_.reset();
 }
 
 bool ServiceWorkerURLLoaderJob::WasCanceled() const {