Reduce/Remove URLRequest dependencies from AppCacheRequestHandler

content/browser/appcache/appcache_interceptor.cc

Index: content/browser/appcache/appcache_interceptor.cc
diff --git a/content/browser/appcache/appcache_interceptor.cc b/content/browser/appcache/appcache_interceptor.cc
index 7d73fa0e9cad1ff526665a047ebefe9a5388a514..ab01aef7e1d773d09ea86c04f4d75f463c4a2709 100644
--- a/content/browser/appcache/appcache_interceptor.cc
+++ b/content/browser/appcache/appcache_interceptor.cc
@@ -11,6 +11,7 @@
 #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.h"
 #include "content/browser/appcache/appcache_url_request_job.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/bad_message.h"
@@ -65,7 +66,8 @@ void AppCacheInterceptor::SetExtraRequestInfoForHost(
     bool should_reset_appcache) {
   // Create a handler for this request and associate it with the request.
   std::unique_ptr<AppCacheRequestHandler> handler =
-      host->CreateRequestHandler(request, resource_type, should_reset_appcache);
+      host->CreateRequestHandler(AppCacheURLRequest::Create(request),
+                                 resource_type, should_reset_appcache);
   if (handler)
     SetHandler(request, std::move(handler));
 }
@@ -141,7 +143,7 @@ net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRequest(
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadResource(request, network_delegate);
+  return handler->MaybeLoadResource(network_delegate);
 }
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
@@ -151,8 +153,7 @@ net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadFallbackForRedirect(
-      request, network_delegate, location);
+  return handler->MaybeLoadFallbackForRedirect(network_delegate, location);
 }
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
@@ -160,7 +161,7 @@ net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadFallbackForResponse(request, network_delegate);
+  return handler->MaybeLoadFallbackForResponse(network_delegate);
 }
 
 }  // namespace content