Revert r143458 (which re-applies r143341 and r142979).

content/browser/renderer_host/cross_site_resource_handler.h

Index: content/browser/renderer_host/cross_site_resource_handler.h
===================================================================
--- content/browser/renderer_host/cross_site_resource_handler.h	(revision 143642)
+++ content/browser/renderer_host/cross_site_resource_handler.h	(working copy)
@@ -9,9 +9,11 @@
 #include "content/browser/renderer_host/layered_resource_handler.h"
 #include "net/url_request/url_request_status.h"
 
+namespace net {
+class URLRequest;
+}
+
 namespace content {
-class ResourceDispatcherHostImpl;
-struct GlobalRequestID;
 
 // Ensures that cross-site responses are delayed until the onunload handler of
 // the previous page is allowed to run.  This handler wraps an
@@ -23,7 +25,7 @@
   CrossSiteResourceHandler(scoped_ptr<ResourceHandler> next_handler,
                            int render_process_host_id,
                            int render_view_id,
-                           ResourceDispatcherHostImpl* rdh);
+                           net::URLRequest* request);
   virtual ~CrossSiteResourceHandler();
 
   // ResourceHandler implementation:
@@ -51,13 +53,13 @@
   void StartCrossSiteTransition(
       int request_id,
       ResourceResponse* response,
-      const GlobalRequestID& global_id,
       bool* defer);
 
   void ResumeIfDeferred();
 
   int render_process_host_id_;
   int render_view_id_;
+  net::URLRequest* request_;
   bool has_started_response_;
   bool in_cross_site_transition_;
   int request_id_;
@@ -66,7 +68,6 @@
   net::URLRequestStatus completed_status_;
   std::string completed_security_info_;
   ResourceResponse* response_;
-  ResourceDispatcherHostImpl* rdh_;
 
   DISALLOW_COPY_AND_ASSIGN(CrossSiteResourceHandler);
 };