Introduce ResourceRequesterInfo to abstract the requester of resource request

content/browser/service_worker/link_header_support.cc

 // Copyright 2016 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/link_header_support.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "components/link_header_util/link_header_util.h"
@@ skipping 34 matching lines @@
       !TrialTokenValidator::RequestEnablesFeature(request, "ForeignFetch")) {
     // TODO(mek): Log attempt to use without having correct token?
     return;
   }
 
   if (ContainsKey(params, "anchor"))
     return;
 
   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();
 
   if (!service_worker_context)
     return;
 
   if (ServiceWorkerUtils::IsMainResourceType(request_info->GetResourceType())) {
     // In case of navigations, make sure the navigation will actually result in
     // a secure context.
     ServiceWorkerProviderHost* provider_host =
         ServiceWorkerRequestHandler::GetProviderHost(request);
     if (!provider_host || !provider_host->IsContextSecureForServiceWorker())
@@ skipping 89 matching lines @@
     const net::URLRequest* request,
     const std::string& link_header,
     ServiceWorkerContextWrapper* service_worker_context_for_testing) {
   for (const auto& value : link_header_util::SplitLinkHeader(link_header)) {
     ProcessLinkHeaderValueForRequest(request, value.first, value.second,
                                      service_worker_context_for_testing);
   }
 }
 
 }  // namespace content