Keep workerStart timing info over request job restarts

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 "base/trace_event/trace_event.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_metrics.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
@@ skipping 46 matching lines @@
   }
 
   if (is_main_resource_load_ && provider_host_)
     provider_host_->SetAllowAssociation(true);
 }
 
 net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     ResourceContext* resource_context) {
+  if (job_.get() && worker_start_time_.is_null()) {
+    // Save worker-start time of the first job.
+    worker_start_time_ = job_->worker_start_time();
+  }
+
   if (!context_ || !provider_host_) {
     // We can't do anything other than to fall back to network.
     job_ = NULL;
     return NULL;
   }
 
   // This may get called multiple times for original and redirect requests:
   // A. original request case: job_ is null, no previous location info.
   // B. redirect or restarted request case:
   //  a) job_ is non-null if the previous location was forwarded to SW.
@@ skipping 35 matching lines @@
 void ServiceWorkerControlleeRequestHandler::GetExtraResponseInfo(
     bool* was_fetched_via_service_worker,
     bool* was_fallback_required_by_service_worker,
     GURL* original_url_via_service_worker,
     blink::WebServiceWorkerResponseType* response_type_via_service_worker,
     base::TimeTicks* worker_start_time) const {
   if (!job_.get()) {
     *was_fetched_via_service_worker = false;
     *was_fallback_required_by_service_worker = false;
     *original_url_via_service_worker = GURL();
+    *worker_start_time = worker_start_time_;
     return;
   }
   job_->GetExtraResponseInfo(
       was_fetched_via_service_worker, was_fallback_required_by_service_worker,
       original_url_via_service_worker, response_type_via_service_worker,
       worker_start_time);
+  if (!worker_start_time_.is_null()) {
+    // If we have worker start time from previous job, use it.
+    *worker_start_time = worker_start_time_;
+  }
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
     const net::URLRequest* request) {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_);
   TRACE_EVENT_ASYNC_BEGIN1(
       "ServiceWorker",
       "ServiceWorkerControlleeRequestHandler::PrepareForMainResource",
@@ skipping 122 matching lines @@
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_->active_version());
   job_->ForwardToServiceWorker();
 }
 
 }  // namespace content