Introduce ResourceRequesterInfo to abstract the requester of resource request

content/browser/appcache/appcache_interceptor.cc

 // Copyright 2014 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/appcache/appcache_interceptor.h"
 
 #include "base/debug/crash_logging.h"
 #include "content/browser/appcache/appcache_backend_impl.h"
 #include "content/browser/appcache/appcache_host.h"
 #include "content/browser/appcache/appcache_request_handler.h"
 #include "content/browser/appcache/appcache_service_impl.h"
 #include "content/browser/appcache/appcache_url_request_job.h"
 #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"
 
 static int kHandlerKey;  // Value is not used.
 
 namespace content {
 
 void AppCacheInterceptor::SetHandler(net::URLRequest* request,
                                      AppCacheRequestHandler* handler) {
   request->SetUserData(&kHandlerKey, handler);  // request takes ownership
@@ skipping 48 matching lines @@
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return;
   handler->PrepareForCrossSiteTransfer(old_process_id);
 }
 
 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 =
         request->first_party_for_cookies();
     if (first_party_url_for_cookies.is_valid()) {
       // TODO(lazyboy): Remove this once we know which extensions run into this
       // issue. See https://crbug.com/612711#c25 for details.
       base::debug::SetCrashKeyValue("aci_wrong_sp_extension_id",
                                     first_party_url_for_cookies.host());
       // 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;
   }
   DCHECK_NE(kAppCacheNoHostId, new_host_id);
   handler->CompleteCrossSiteTransfer(new_process_id,
                                      new_host_id);
 }
 
 void AppCacheInterceptor::MaybeCompleteCrossSiteTransferInOldProcess(
     net::URLRequest* request,
@@ skipping 31 matching lines @@
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
   return handler->MaybeLoadFallbackForResponse(request, network_delegate);
 }
 
 }  // namespace content