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

content/public/test/mock_render_thread.cc

 // Copyright (c) 2012 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/public/test/mock_render_thread.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_process_observer.h"
@@ skipping 202 matching lines @@
   *route_id = new_window_routing_id_;
   *main_frame_route_id = new_window_main_frame_routing_id_;
   *surface_id = surface_id_;
   *cloned_session_storage_namespace_id = 0;
 }
 
 // The Frame expects to be returned a valid route_id different from its own.
 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id,
                                           const std::string& frame_name,
                                           int* new_render_frame_id) {
-  *new_render_frame_id = new_frame_routing_id_;
+  *new_render_frame_id = new_frame_routing_id_++;
 }
 
 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
   ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
   RenderProcessObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     if (observer->OnControlMessageReceived(msg))
       return true;
   }
   return OnMessageReceived(msg);
@@ skipping 18 matching lines @@
 void MockRenderThread::OnDuplicateSection(
     base::SharedMemoryHandle renderer_handle,
     base::SharedMemoryHandle* browser_handle) {
   // We don't have to duplicate the input handles since RenderViewTest does not
   // separate a browser process from a renderer process.
   *browser_handle = renderer_handle;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace content