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 ab01aef7e1d773d09ea86c04f4d75f463c4a2709..3f188d87536816344e12096e51e61fa5f51f093c 100644
--- a/content/browser/appcache/appcache_interceptor.cc
+++ b/content/browser/appcache/appcache_interceptor.cc
@@ -119,8 +119,7 @@ void AppCacheInterceptor::CompleteCrossSiteTransfer(
     return;
   }
   DCHECK_NE(kAppCacheNoHostId, new_host_id);
-  handler->CompleteCrossSiteTransfer(new_process_id,
-                                     new_host_id);
+  handler->CompleteCrossSiteTransfer(new_process_id, new_host_id);
 }
 
 void AppCacheInterceptor::MaybeCompleteCrossSiteTransferInOldProcess(
@@ -143,7 +142,9 @@ net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRequest(
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadResource(network_delegate);
+
+  AppCacheJob* job = handler->MaybeLoadResource(network_delegate);
+  return job ? job->AsURLRequestJob() : nullptr;
 }
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
@@ -153,7 +154,8 @@ net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadFallbackForRedirect(network_delegate, location);
+  return handler->MaybeLoadFallbackForRedirect(network_delegate, location)
+      ->AsURLRequestJob();
 }
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
@@ -161,7 +163,8 @@ net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadFallbackForResponse(network_delegate);
+  return handler->MaybeLoadFallbackForResponse(network_delegate)
+      ->AsURLRequestJob();
 }
 
 }  // namespace content