Add workerReady timing for ServiceWorker controlled requests [2/3]

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"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_url_request_job.h"
 #include "content/browser/service_worker/service_worker_utils.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/resource_response_info.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler(
     base::WeakPtr<ServiceWorkerContextCore> context,
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
@@ skipping 30 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.
+    // Save worker timings of the first job.
     worker_start_time_ = job_->worker_start_time();
+    worker_ready_time_ = job_->worker_ready_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.
@@ skipping 28 matching lines @@
     // the storage lookup returned immediately), just return NULL here to
     // fallback to network.
     job_ = NULL;
     return NULL;
   }
 
   return job_.get();
 }
 
 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 {
+    ResourceResponseInfo* response_info) 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_;
+    response_info->was_fetched_via_service_worker = false;
+    response_info->was_fallback_required_by_service_worker = false;
+    response_info->original_url_via_service_worker = GURL();
+    response_info->service_worker_start_time = worker_start_time_;
+    response_info->service_worker_ready_time = worker_ready_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);
+  job_->GetExtraResponseInfo(response_info);
   if (!worker_start_time_.is_null()) {
-    // If we have worker start time from previous job, use it.
-    *worker_start_time = worker_start_time_;
+    // If we have worker timings from previous job, use it.
+    response_info->service_worker_start_time = worker_start_time_;
+    response_info->service_worker_ready_time = worker_ready_time_;
   }
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
     const net::URLRequest* request) {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_);
   TRACE_EVENT_ASYNC_BEGIN1(
       "ServiceWorker",
@@ skipping 123 matching lines @@
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_->active_version());
   job_->ForwardToServiceWorker();
 }
 
 }  // namespace content