Introduce ResourceRequesterInfo to abstract the requester of resource request

content/browser/service_worker/link_header_support.cc

Index: content/browser/service_worker/link_header_support.cc
diff --git a/content/browser/service_worker/link_header_support.cc b/content/browser/service_worker/link_header_support.cc
index 0cb2f29d8a3ded4bf92279cd0a4a75ced503447d..8fc57a82e421e06601b352beb8fc3443cf1ad682 100644
--- a/content/browser/service_worker/link_header_support.cc
+++ b/content/browser/service_worker/link_header_support.cc
@@ -52,15 +52,10 @@ void HandleServiceWorkerLink(
 
   const ResourceRequestInfoImpl* request_info =
       ResourceRequestInfoImpl::ForRequest(request);
-  ResourceMessageFilter* filter = request_info->filter();
   ServiceWorkerContext* service_worker_context =
-      filter ? filter->service_worker_context()
-             : service_worker_context_for_testing;
-  if (IsBrowserSideNavigationEnabled() &&
-      ServiceWorkerUtils::IsMainResourceType(request_info->GetResourceType()) &&
-      !service_worker_context) {
-    service_worker_context = request_info->service_worker_context();
-  }
+      service_worker_context_for_testing
+          ? service_worker_context_for_testing
+          : request_info->requester_info().service_worker_context();

[kinuko, 2016/11/10 08:17:57]

Isn't this doing a little different thing from the original code?  (Original
code was trying to use filter's service_worker_context before checking
sw_context_for_testing)

[horo, 2016/11/10 14:46:33]

Yes, there is a difference.
But there is no problem.
service_worker_context_for_testing is used only by LinkHeaderServiceWorkerTest
to pass the SWContext.

 
   if (!service_worker_context)
     return;