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

Unified Diff: content/browser/appcache/appcache_interceptor.cc

Issue 2481093003: Introduce ResourceRequesterInfo to abstract the requester of resource request (Closed)
Patch Set: fix URLLoaderFactoryImplTest.CancelFromRenderer 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/appcache/appcache_interceptor.cc
diff --git a/content/browser/appcache/appcache_interceptor.cc b/content/browser/appcache/appcache_interceptor.cc
index 85022442562c6f188f524bd50fabdf98e3b33f3b..dba41c5d6b45b81440be3a74e8363eece4380c09 100644
--- a/content/browser/appcache/appcache_interceptor.cc
+++ b/content/browser/appcache/appcache_interceptor.cc
@@ -13,6 +13,7 @@
#include "content/browser/appcache/chrome_appcache_service.h"
#include "content/browser/bad_message.h"
#include "content/browser/loader/resource_message_filter.h"
+#include "content/browser/loader/resource_requester_info.h"
#include "content/common/appcache_interfaces.h"
#include "net/url_request/url_request.h"
@@ -81,11 +82,13 @@ void AppCacheInterceptor::CompleteCrossSiteTransfer(
net::URLRequest* request,
int new_process_id,
int new_host_id,
- ResourceMessageFilter* filter) {
+ const ResourceRequesterInfo* requester_info) {
+ // AppCache is supported only for renderer initiated requests.
+ DCHECK(requester_info->IsRenderer());
AppCacheRequestHandler* handler = GetHandler(request);
if (!handler)
return;
- if (!handler->SanityCheckIsSameService(filter->appcache_service())) {
+ if (!handler->SanityCheckIsSameService(requester_info->appcache_service())) {
// This can happen when V2 apps and web pages end up in the same storage
// partition.
const GURL& first_party_url_for_cookies =
@@ -98,7 +101,7 @@ void AppCacheInterceptor::CompleteCrossSiteTransfer(
// No need to explicitly call DumpWithoutCrashing(), since
// bad_message::ReceivedBadMessage() below will do that.
}
- bad_message::ReceivedBadMessage(filter,
+ bad_message::ReceivedBadMessage(requester_info->filter(),
bad_message::ACI_WRONG_STORAGE_PARTITION);
return;
}

Powered by Google App Engine
This is Rietveld 408576698