| 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 b2364d8518e914b7bef72b45ac46fba6e154a532..624d55695c9d0687ff946ff6073ada7f2eea1994 100644
|
| --- a/content/browser/service_worker/link_header_support.cc
|
| +++ b/content/browser/service_worker/link_header_support.cc
|
| @@ -34,7 +34,7 @@ void RegisterServiceWorkerFinished(int64_t trace_id, bool result) {
|
| }
|
|
|
| void HandleServiceWorkerLink(
|
| - const net::URLRequest* request,
|
| + net::URLRequest* request,
|
| const std::string& url,
|
| const std::unordered_map<std::string, base::Optional<std::string>>& params,
|
| ServiceWorkerContextWrapper* service_worker_context_for_testing) {
|
| @@ -50,17 +50,12 @@ void HandleServiceWorkerLink(
|
| if (ContainsKey(params, "anchor"))
|
| return;
|
|
|
| - const ResourceRequestInfoImpl* request_info =
|
| + 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;
|
| @@ -133,7 +128,7 @@ void HandleServiceWorkerLink(
|
| }
|
|
|
| void ProcessLinkHeaderValueForRequest(
|
| - const net::URLRequest* request,
|
| + net::URLRequest* request,
|
| std::string::const_iterator value_begin,
|
| std::string::const_iterator value_end,
|
| ServiceWorkerContextWrapper* service_worker_context_for_testing) {
|
| @@ -159,7 +154,7 @@ void ProcessLinkHeaderValueForRequest(
|
|
|
| } // namespace
|
|
|
| -void ProcessRequestForLinkHeaders(const net::URLRequest* request) {
|
| +void ProcessRequestForLinkHeaders(net::URLRequest* request) {
|
| std::string link_header;
|
| request->GetResponseHeaderByName("link", &link_header);
|
| if (link_header.empty())
|
| @@ -169,7 +164,7 @@ void ProcessRequestForLinkHeaders(const net::URLRequest* request) {
|
| }
|
|
|
| void ProcessLinkHeaderForRequest(
|
| - const net::URLRequest* request,
|
| + net::URLRequest* request,
|
| const std::string& link_header,
|
| ServiceWorkerContextWrapper* service_worker_context_for_testing) {
|
| for (const auto& value : link_header_util::SplitLinkHeader(link_header)) {
|
|
|