Unify frame IDs with RenderFrameHost routing IDs.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index c871e0430c7229a4232c80fb27728e24a491857a..a9d3d568789f4d72c7eef7e3a9aea69d40d30624 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -327,7 +327,10 @@ void RenderFrameHostManager::SwappedOutFrame(
   }
 
   // Sanity check that this is for the correct frame.
-  DCHECK_EQ(frame_tree_node_->frame_id(), pending_nav_params_->frame_id);
+  DCHECK_EQ(frame_tree_node_->current_frame_host()->GetRoutingID(),
+            pending_nav_params_->frame_id);
+  DCHECK_EQ(frame_tree_node_->current_frame_host()->GetProcess()->GetID(),
+            pending_nav_params_->global_request_id.child_id);
 
   // Now that the unload handler has run, we need to either initiate the
   // pending transfer (if there is one) or resume the paused response (if not).