Set service worker response info data for foreign fetch intercepted fetches.

content/browser/service_worker/service_worker_controllee_request_handler.cc

Index: content/browser/service_worker/service_worker_controllee_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
index 7708f7bd10ad209f9b0c4d93e9c77439b590b962..7b9b35c2f65f13ebd0b38aab55b6107763f09df3 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -12,6 +12,7 @@
 #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_response_info.h"
 #include "content/browser/service_worker/service_worker_url_request_job.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
@@ -50,10 +51,6 @@ ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler(
       body_(body),
       force_update_started_(false),
       use_network_(false),
-      was_fetched_via_service_worker_(false),
-      was_fallback_required_(false),
-      response_type_via_service_worker_(
-          blink::WebServiceWorkerResponseTypeDefault),
       weak_factory_(this) {}
 
 ServiceWorkerControlleeRequestHandler::
@@ -76,6 +73,7 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
     net::NetworkDelegate* network_delegate,
     ResourceContext* resource_context) {
   ClearJob();
+  ServiceWorkerResponseInfo::ResetDataForRequest(request);
 
   if (!context_ || !provider_host_) {
     // We can't do anything other than to fall back to network.
@@ -133,22 +131,6 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
   return job.release();
 }
 
-void ServiceWorkerControlleeRequestHandler::GetExtraResponseInfo(
-    ResourceResponseInfo* response_info) const {
-  response_info->was_fetched_via_service_worker =
-      was_fetched_via_service_worker_;
-  response_info->was_fallback_required_by_service_worker =
-      was_fallback_required_;
-  response_info->original_url_via_service_worker =
-      original_url_via_service_worker_;
-  response_info->response_type_via_service_worker =
-      response_type_via_service_worker_;
-  response_info->service_worker_start_time = service_worker_start_time_;
-  response_info->service_worker_ready_time = service_worker_ready_time_;
-  response_info->is_in_cache_storage = response_is_in_cache_storage_;
-  response_info->cache_storage_cache_name = response_cache_storage_cache_name_;
-}
-
 void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
     const net::URLRequest* request) {
   DCHECK(job_.get());
@@ -373,39 +355,9 @@ void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   job_->ForwardToServiceWorker();
 }
 
-void ServiceWorkerControlleeRequestHandler::OnPrepareToRestart(
-    base::TimeTicks service_worker_start_time,
-    base::TimeTicks service_worker_ready_time) {
+void ServiceWorkerControlleeRequestHandler::OnPrepareToRestart() {
   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;
-    service_worker_ready_time_ = service_worker_ready_time;
-  }
-}
-
-void ServiceWorkerControlleeRequestHandler::OnStartCompleted(
-    bool was_fetched_via_service_worker,
-    bool was_fallback_required,
-    const GURL& original_url_via_service_worker,
-    blink::WebServiceWorkerResponseType response_type_via_service_worker,
-    base::TimeTicks service_worker_start_time,
-    base::TimeTicks service_worker_ready_time,
-    bool response_is_in_cache_storage,
-    const std::string& response_cache_storage_cache_name) {
-  was_fetched_via_service_worker_ = was_fetched_via_service_worker;
-  was_fallback_required_ = was_fallback_required;
-  original_url_via_service_worker_ = original_url_via_service_worker;
-  response_type_via_service_worker_ = response_type_via_service_worker;
-  response_is_in_cache_storage_ = response_is_in_cache_storage;
-  response_cache_storage_cache_name_ = response_cache_storage_cache_name;
-
-  // 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;
-    service_worker_ready_time_ = service_worker_ready_time;
-  }
 }
 
 ServiceWorkerVersion*
@@ -441,13 +393,6 @@ void ServiceWorkerControlleeRequestHandler::MainResourceLoadFailed() {
 
 void ServiceWorkerControlleeRequestHandler::ClearJob() {
   job_.reset();
-  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