Create RenderFrameProxyHost at time of swap-out instead of commit.

content/renderer/render_view_browsertest.cc

Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index b06151b93a6c9496d78be4bb62485f7ff2baa79a..3e93af3e74de4f2948b30914deb543ee193fe6aa 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -488,7 +488,7 @@ TEST_F(RenderViewImplTest, SendSwapOutACK) {
   int initial_page_id = view()->GetPageId();
 
   // Respond to a swap out request.
-  view()->main_render_frame()->OnSwapOut();
+  view()->main_render_frame()->OnSwapOut(MSG_ROUTING_NONE);

[Charlie Reis, 2014/05/15 00:32:50]

Doesn't RenderFrameProxy's constructor assume that it has a valid routing ID for
the proxy, and call AddRoute with it?

[nasko, 2014/05/15 18:47:13]

Contrary to its name, this is actually an unit test. There are no real IPCs
being dispatched between processes. I've replaced it with a constant, similar to
other unit tests.

 
   // Ensure the swap out commits synchronously.
   EXPECT_NE(initial_page_id, view()->GetPageId());
@@ -501,7 +501,7 @@ TEST_F(RenderViewImplTest, SendSwapOutACK) {
   // It is possible to get another swap out request.  Ensure that we send
   // an ACK, even if we don't have to do anything else.
   render_thread_->sink().ClearMessages();
-  view()->main_render_frame()->OnSwapOut();
+  view()->main_render_frame()->OnSwapOut(MSG_ROUTING_NONE);
   const IPC::Message* msg2 = render_thread_->sink().GetUniqueMessageMatching(
       FrameHostMsg_SwapOut_ACK::ID);
   ASSERT_TRUE(msg2);
@@ -556,7 +556,7 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) {
   ProcessPendingMessages();
 
   // Respond to a swap out request.
-  view()->main_render_frame()->OnSwapOut();
+  view()->main_render_frame()->OnSwapOut(MSG_ROUTING_NONE);
 
   // Check for a OnSwapOutACK.
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(