DevTools: introduce the bypass service worker checkbox.

content/browser/service_worker/service_worker_controllee_request_handler.cc

 // Copyright 2014 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_controllee_request_handler.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 89 matching lines @@
   }
 
   // It's for original request (A) or redirect case (B-a or B-b).
   scoped_ptr<ServiceWorkerURLRequestJob> job(new ServiceWorkerURLRequestJob(
       request, network_delegate, provider_host_->client_uuid(),
       blob_storage_context_, resource_context, request_mode_, credentials_mode_,
       redirect_mode_, resource_type_, request_context_type_, frame_type_, body_,
       ServiceWorkerFetchType::FETCH, this));
   job_ = job->GetWeakPtr();
 
+  if (context_->fallback_to_network_for_devtools())

[horo, 2016/04/08 05:41:15]

(1) Remove line 110-112.

+    job_->FallbackToNetwork();
+
   resource_context_ = resource_context;
 
   if (is_main_resource_load_)
     PrepareForMainResource(request);
   else
     PrepareForSubResource();
 
   if (job_->ShouldFallbackToNetwork()) {
     // If we know we can fallback to network at this point (in case
     // the storage lookup returned immediately), just destroy the job and return
@@ skipping 55 matching lines @@
 
 void
 ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
     ServiceWorkerStatusCode status,
     const scoped_refptr<ServiceWorkerRegistration>& registration) {
   // The job may have been canceled and then destroyed before this was invoked.
   if (!job_)
     return;
 
   const bool need_to_update = !force_update_started_ && registration &&
-                              context_->force_update_on_page_load();
+                              context_->update_on_page_load_for_devtools();
 
   if (provider_host_ && !need_to_update)
     provider_host_->SetAllowAssociation(true);
   if (status != SERVICE_WORKER_OK || !provider_host_ || !context_) {
     job_->FallbackToNetwork();
     TRACE_EVENT_ASYNC_END1(
         "ServiceWorker",
         "ServiceWorkerControlleeRequestHandler::PrepareForMainResource",
         job_.get(),
         "Status", status);
@@ skipping 65 matching lines @@
         "ServiceWorkerControlleeRequestHandler::PrepareForMainResource",
         job_.get(),
         "Status", status,
         "Info",
         "ServiceWorkerVersion is not available, so falling back to network");
     return;
   }
 
   ServiceWorkerMetrics::CountControlledPageLoad(stripped_url_);
 
   job_->ForwardToServiceWorker();

[horo, 2016/04/08 05:41:15]

(3) Change here.

   TRACE_EVENT_ASYNC_END2(
       "ServiceWorker",
       "ServiceWorkerControlleeRequestHandler::PrepareForMainResource",
       job_.get(),
       "Status", status,
       "Info",
       "Forwarded to the ServiceWorker");
 }
 
 void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
     ServiceWorkerRegistration* registration,
     ServiceWorkerVersion* version) {
   // The job may have been canceled and then destroyed before this was invoked.
   if (!job_)
     return;
 
   if (provider_host_)
     provider_host_->SetAllowAssociation(true);
   if (version != registration->active_version() ||
       version->status() != ServiceWorkerVersion::ACTIVATED ||
       !provider_host_) {
     job_->FallbackToNetwork();
     return;
   }
 
   ServiceWorkerMetrics::CountControlledPageLoad(stripped_url_);
 
   provider_host_->AssociateRegistration(registration,
                                         false /* notify_controllerchange */);
   job_->ForwardToServiceWorker();

[horo, 2016/04/08 05:41:15]

(4) Change here.

 }
 
 void ServiceWorkerControlleeRequestHandler::DidUpdateRegistration(
     const scoped_refptr<ServiceWorkerRegistration>& original_registration,
     ServiceWorkerStatusCode status,
     const std::string& status_message,
     int64_t registration_id) {
   DCHECK(force_update_started_);
 
   // The job may have been canceled and then destroyed before this was invoked.
@@ skipping 49 matching lines @@
   }
   version->RegisterStatusChangeCallback(
       base::Bind(&self::OnUpdatedVersionStatusChanged,
                  weak_factory_.GetWeakPtr(), registration, version));
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_->active_version());
   job_->ForwardToServiceWorker();

[horo, 2016/04/08 05:41:15]

(2) Change here.

 }
 
 void ServiceWorkerControlleeRequestHandler::OnPrepareToRestart(
     base::TimeTicks service_worker_start_time,
     base::TimeTicks service_worker_ready_time) {
   use_network_ = true;
   ClearJob();
   // Update times, if not already set by a previous Job.
   if (service_worker_start_time_.is_null()) {
     service_worker_start_time_ = service_worker_start_time;
@@ skipping 60 matching lines @@
   was_fetched_via_service_worker_ = false;
   was_fallback_required_ = false;
   original_url_via_service_worker_ = GURL();
   response_type_via_service_worker_ =
       blink::WebServiceWorkerResponseTypeDefault;
   response_is_in_cache_storage_ = false;
   response_cache_storage_cache_name_ = std::string();
 }
 
 }  // namespace content