| 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..acc98c0a8e82cdb0246a470975bacf60965f5ca1 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) {
|
| + 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;
|
| }
|
|
|