Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index a4c0acb265cac6809c543044afa7ff0b5aa2f118..11544d502e199aed3e44fb26dc36739f3b92d49c 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -24,6 +24,7 @@
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
+#include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/debug_urls.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
@@ -1297,6 +1298,8 @@ int RenderFrameHostImpl::GetEnabledBindings() {
 void RenderFrameHostImpl::SetNavigationHandle(
     std::unique_ptr<NavigationHandleImpl> navigation_handle) {
   navigation_handle_ = std::move(navigation_handle);
+  if (navigation_handle_)
+    navigation_handle_->set_render_frame_host(this);
 }
 
 std::unique_ptr<NavigationHandleImpl>
@@ -1307,6 +1310,20 @@ RenderFrameHostImpl::PassNavigationHandleOwnership() {
   return std::move(navigation_handle_);
 }
 
+void RenderFrameHostImpl::OnCrossSiteResponse(
+    const GlobalRequestID& global_request_id,
+    std::unique_ptr<CrossSiteTransferringRequest>
+        cross_site_transferring_request,
+    const std::vector<GURL>& transfer_url_chain,
+    const Referrer& referrer,
+    ui::PageTransition page_transition,
+    bool should_replace_current_entry) {
+  frame_tree_node_->render_manager()->OnCrossSiteResponse(
+      this, global_request_id, std::move(cross_site_transferring_request),
+      transfer_url_chain, referrer, page_transition,
+      should_replace_current_entry);
+}
+
 void RenderFrameHostImpl::SwapOut(
     RenderFrameProxyHost* proxy,
     bool is_loading) {