Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(924)

Unified Diff: content/browser/service_worker/link_header_support.cc

Issue 2481093003: Introduce ResourceRequesterInfo to abstract the requester of resource request (Closed)
Patch Set: make ResourceRequestInfoImpl::requester_info() non-const Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..e57d4e05340fe6db25ed69c8ed24eae812db4e14 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)) {

Powered by Google App Engine
This is Rietveld 408576698