Small fixes for Servicified SW code path

content/browser/service_worker/service_worker_url_loader_job.cc

 // Copyright 2017 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_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"
 #include "storage/browser/blob/blob_storage_context.h"
 
 namespace content {
 
 ServiceWorkerURLLoaderJob::ServiceWorkerURLLoaderJob(
     LoaderCallback callback,
     Delegate* delegate,
     const ResourceRequest& resource_request,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context)
     : loader_callback_(std::move(callback)),
       delegate_(delegate),
       resource_request_(resource_request),
       blob_storage_context_(blob_storage_context),
       binding_(this),
       weak_factory_(this) {
-  DCHECK(IsBrowserSideNavigationEnabled() &&
-         base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kEnableNetworkService));
+  DCHECK(ServiceWorkerUtils::IsServicificationEnabled());
 }
 
 ServiceWorkerURLLoaderJob::~ServiceWorkerURLLoaderJob() {}
 
 void ServiceWorkerURLLoaderJob::FallbackToNetwork() {
   response_type_ = FALLBACK_TO_NETWORK;
   // This could be called multiple times in some cases because we simply
   // call this synchronously here and don't wait for a separate async
   // StartRequest cue like what URLRequestJob case does.
   // TODO(kinuko): Make sure this is ok or we need to make this async.
@@ skipping 24 matching lines @@
   NOTIMPLEMENTED();
   return 0;
 }
 
 void ServiceWorkerURLLoaderJob::FailDueToLostController() {
   NOTIMPLEMENTED();
 }
 
 void ServiceWorkerURLLoaderJob::Cancel() {
   canceled_ = true;
+  weak_factory_.InvalidateWeakPtrs();
+  blob_reader_.reset();
+  blob_storage_context_.reset();
+  fetch_dispatcher_.reset();
 }
 
 bool ServiceWorkerURLLoaderJob::WasCanceled() const {
   return canceled_;
 }
 
 void ServiceWorkerURLLoaderJob::StartRequest() {
   DCHECK_EQ(FORWARD_TO_SERVICE_WORKER, response_type_);
 
   ServiceWorkerMetrics::URLRequestJobResult result =
@@ skipping 124 matching lines @@
 void ServiceWorkerURLLoaderJob::FollowRedirect() {
   NOTIMPLEMENTED();
 }
 
 void ServiceWorkerURLLoaderJob::SetPriority(net::RequestPriority priority,
                                             int32_t intra_priority_value) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace content