Revert of ServiceWorker: Bypass SW when the script doesn't have fetch handler

content/browser/service_worker/service_worker_controllee_request_handler.cc

Index: content/browser/service_worker/service_worker_controllee_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
index 55b4348a4356d6a21fc262784d88c1c05afbb7a4..e45ca4c7d3f425d276d0c548aa33c3be1e74b974 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -27,23 +27,6 @@
 
 namespace content {
 
-namespace {
-
-bool MaybeForwardToServiceWorker(ServiceWorkerURLRequestJob* job,
-                                 const ServiceWorkerVersion* version) {
-  DCHECK(job);
-  DCHECK(version);
-  if (version->has_fetch_handler()) {
-    job->ForwardToServiceWorker();
-    return true;
-  }
-
-  job->FallbackToNetwork();
-  return false;
-}
-
-}  // namespace
-
 ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler(
     base::WeakPtr<ServiceWorkerContextCore> context,
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
@@ -283,15 +266,11 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
   ServiceWorkerMetrics::CountControlledPageLoad(
       stripped_url_, active_version->has_fetch_handler(), is_main_frame_load_);
 
-  bool is_forwarded =
-      MaybeForwardToServiceWorker(job_.get(), active_version.get());
-
+  job_->ForwardToServiceWorker();
   TRACE_EVENT_ASYNC_END2(
       "ServiceWorker",
       "ServiceWorkerControlleeRequestHandler::PrepareForMainResource",
-      job_.get(), "Status", status, "Info",
-      (is_forwarded) ? "Forwarded to the ServiceWorker"
-                     : "Skipped the ServiceWorker which has no fetch handler");
+      job_.get(), "Status", status, "Info", "Forwarded to the ServiceWorker");
 }
 
 void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
@@ -315,8 +294,7 @@ void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
 
   provider_host_->AssociateRegistration(registration,
                                         false /* notify_controllerchange */);
-
-  MaybeForwardToServiceWorker(job_.get(), version);
+  job_->ForwardToServiceWorker();
 }
 
 void ServiceWorkerControlleeRequestHandler::DidUpdateRegistration(
@@ -386,7 +364,7 @@ void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_->active_version());
-  MaybeForwardToServiceWorker(job_.get(), provider_host_->active_version());
+  job_->ForwardToServiceWorker();
 }
 
 void ServiceWorkerControlleeRequestHandler::OnPrepareToRestart() {