Add an abstraction for a job in the AppCacheRequestHandler class.

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 <utility>
 
 #include "base/debug/crash_logging.h"
 #include "content/browser/appcache/appcache_backend_impl.h"
@@ skipping 101 matching lines @@
       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(requester_info->filter(),
                                     bad_message::ACI_WRONG_STORAGE_PARTITION);
     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(
     net::URLRequest* request,
     int process_id) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return;
   handler->MaybeCompleteCrossSiteTransferInOldProcess(process_id);
 }
 
 AppCacheInterceptor::AppCacheInterceptor() {
 }
 
 AppCacheInterceptor::~AppCacheInterceptor() {
 }
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRequest(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
   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(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     const GURL& location) const {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadFallbackForRedirect(network_delegate, location);
+
+  AppCacheJob* job =
+      handler->MaybeLoadFallbackForRedirect(network_delegate, location);
+  return job ? job->AsURLRequestJob() : nullptr;
 }
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
-  return handler->MaybeLoadFallbackForResponse(network_delegate);
+
+  AppCacheJob* job = handler->MaybeLoadFallbackForResponse(network_delegate);
+  return job ? job->AsURLRequestJob() : nullptr;
 }
 
 }  // namespace content