M57: Add UseCounter for ServiceWorkerNavigationPreload.

content/browser/service_worker/service_worker_url_request_job.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_url_request_job.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 780 matching lines @@
 }
 
 void ServiceWorkerURLRequestJob::NotifyStartError(
     net::URLRequestStatus status) {
   OnStartCompleted();
   URLRequestJob::NotifyStartError(status);
 }
 
 void ServiceWorkerURLRequestJob::NotifyRestartRequired() {
   ServiceWorkerResponseInfo::ForRequest(request_, true)
-      ->OnPrepareToRestart(worker_start_time_, worker_ready_time_);
+      ->OnPrepareToRestart(worker_start_time_, worker_ready_time_,
+                           did_navigation_preload_);
   delegate_->OnPrepareToRestart();
   URLRequestJob::NotifyRestartRequired();
 }
 
 void ServiceWorkerURLRequestJob::OnStartCompleted() const {
   switch (response_type_) {
     case NOT_DETERMINED:
       NOTREACHED();
       return;
     case FAIL_DUE_TO_LOST_CONTROLLER:
     case FALLBACK_TO_NETWORK:
       // Indicate that the service worker did not respond to the request.
       ServiceWorkerResponseInfo::ForRequest(request_, true)
           ->OnStartCompleted(
               false /* was_fetched_via_service_worker */,
               false /* was_fetched_via_foreign_fetch */,
               false /* was_fallback_required */,
               std::vector<GURL>() /* url_list_via_service_worker */,
               blink::WebServiceWorkerResponseTypeDefault,
               base::TimeTicks() /* service_worker_start_time */,
               base::TimeTicks() /* service_worker_ready_time */,
               false /* response_is_in_cache_storage */,
               std::string() /* response_cache_storage_cache_name */,
-              ServiceWorkerHeaderList() /* cors_exposed_header_names */);
+              ServiceWorkerHeaderList() /* cors_exposed_header_names */,
+              did_navigation_preload_);
       break;
     case FALLBACK_TO_RENDERER:
     case FORWARD_TO_SERVICE_WORKER:
       // Indicate that the service worker responded to the request, which is
       // considered true if "fallback to renderer" was required since the
       // renderer expects that.
       ServiceWorkerResponseInfo::ForRequest(request_, true)
           ->OnStartCompleted(
               true /* was_fetched_via_service_worker */,
               fetch_type_ == ServiceWorkerFetchType::FOREIGN_FETCH,
               fall_back_required_, response_url_list_,
               service_worker_response_type_, worker_start_time_,
               worker_ready_time_, response_is_in_cache_storage_,
-              response_cache_storage_cache_name_, cors_exposed_header_names_);
+              response_cache_storage_cache_name_, cors_exposed_header_names_,
+              did_navigation_preload_);
       break;
   }
 }
 
 bool ServiceWorkerURLRequestJob::IsMainResourceLoad() const {
   return ServiceWorkerUtils::IsMainResourceType(resource_type_);
 }
 
 bool ServiceWorkerURLRequestJob::HasRequestBody() {
   // URLRequest::has_upload() must be checked since its upload data may have
@@ skipping 58 matching lines @@
   DCHECK(!reported_navigation_preload_metrics_);
   reported_navigation_preload_metrics_ = true;
 
   ServiceWorkerMetrics::RecordNavigationPreloadResponse(
       worker_ready_time_ - worker_start_time_,
       navigation_preload_response_time_ - worker_start_time_,
       initial_worker_status_, worker_start_situation_);
 }
 
 }  // namespace content