Set up Mojo connection when RenderFrameHost is reused for new RenderFrame

content/browser/frame_host/frame_tree.cc

 // Copyright 2013 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/frame_host/frame_tree.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 212 matching lines @@
 }
 
 void FrameTree::RenderProcessGone(RenderViewHost* render_view_host) {
   // Walk the full tree looking for nodes that may be affected.  Once a frame
   // crashes, all of its child FrameTreeNodes go away.
   // Note that the helper function may call ResetForNewProcess on a node, which
   // clears its children before we iterate over them.  That's ok, because
   // ForEach does not add a node's children to the queue until after visiting
   // the node itself.
   ForEach(base::Bind(&ResetNodesForNewProcess, render_view_host));
+
+  // Ensure that if the main frame is reused for a new RenderFrame, it will
+  // set up the Mojo connection with that frame.
+  GetMainFrame()->InvalidateMojoConnection();

[Charlie Reis, 2014/10/23 18:38:31]

I don't think we want to do this on the main frame.  We get here for subframe
crashes (in --site-per-process mode) as well.  It should probably happen on the
frame itself in ResetNodesForNewProcess.

[blundell, 2014/10/24 14:42:54]

Done.

 }
 
 RenderFrameHostImpl* FrameTree::GetMainFrame() const {
   return root_->current_frame_host();
 }
 
 FrameTreeNode* FrameTree::GetFocusedFrame() {
   return FindByID(focused_frame_tree_node_id_);
 }
 
@@ skipping 102 matching lines @@
         rvh->Shutdown();
         render_view_host_pending_shutdown_map_.erase(multi_iter);
       }
       break;
     }
     CHECK(render_view_host_found);
   }
 }
 
 }  // namespace content