Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/loader/resource_dispatcher_host_impl.h

 // Copyright (c) 2012 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.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 125 matching lines @@
                          ResourceMessageFilter* filter);
 
   // Cancels the given request if it still exists.
   void CancelRequest(int child_id, int request_id);
 
   // Marks the request, with its current |response|, as "parked". This
   // happens if a request is redirected cross-site and needs to be
   // resumed by a new process.
   void MarkAsTransferredNavigation(
       const GlobalRequestID& id,
-      const scoped_refptr<ResourceResponse>& response);
+      const base::Closure& on_transfer_complete_callback);
 
   // Cancels a request previously marked as being transferred, for use when a
   // navigation was cancelled.
   void CancelTransferringNavigation(const GlobalRequestID& id);
 
   // Resumes the request without transferring it to a new process.
   void ResumeDeferredNavigation(const GlobalRequestID& id);
 
   // Returns the number of pending requests. This is designed for the unittests
   int pending_requests() const {
@@ skipping 586 matching lines @@
 
   // Points to the registered download handler intercept.
   CreateDownloadHandlerIntercept create_download_handler_intercept_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_DISPATCHER_HOST_IMPL_H_