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

content/browser/service_worker/service_worker_context_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_context_request_handler.h"
 
 #include "base/time/time.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_read_from_cache_job.h"
 #include "content/browser/service_worker/service_worker_storage.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/browser/service_worker/service_worker_write_to_cache_job.h"
 #include "content/public/browser/resource_context.h"
+#include "content/public/common/resource_response_info.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 ServiceWorkerContextRequestHandler::ServiceWorkerContextRequestHandler(
     base::WeakPtr<ServiceWorkerContextCore> context,
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
     ResourceType resource_type)
@@ skipping 61 matching lines @@
   if (ShouldReadFromScriptCache(request->url(), &response_id)) {
     return new ServiceWorkerReadFromCacheJob(
         request, network_delegate, context_, version_, response_id);
   }
 
   // NULL means use the network.
   return NULL;
 }
 
 void ServiceWorkerContextRequestHandler::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 {
-  *was_fetched_via_service_worker = false;
-  *was_fallback_required_by_service_worker = false;
-  *original_url_via_service_worker = GURL();
-  *response_type_via_service_worker =
+    ResourceResponseInfo* response_info) const {
+  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->response_type_via_service_worker =
       blink::WebServiceWorkerResponseTypeDefault;
 }
 
 bool ServiceWorkerContextRequestHandler::ShouldAddToScriptCache(
     const GURL& url) {
   // We only write imports that occur during the initial eval.
   if (version_->status() != ServiceWorkerVersion::NEW &&
       version_->status() != ServiceWorkerVersion::INSTALLING) {
     return false;
   }
   return version_->script_cache_map()->LookupResourceId(url) ==
          kInvalidServiceWorkerResponseId;
 }
 
 bool ServiceWorkerContextRequestHandler::ShouldReadFromScriptCache(
     const GURL& url, int64* response_id_out) {
   // We don't read from the script cache until the version is INSTALLED.
   if (version_->status() == ServiceWorkerVersion::NEW ||
       version_->status() == ServiceWorkerVersion::INSTALLING)
     return false;
   *response_id_out = version_->script_cache_map()->LookupResourceId(url);
   return *response_id_out != kInvalidServiceWorkerResponseId;
 }
 
 }  // namespace content