Give the main frame a RenderWidget.

content/public/test/mock_render_thread.h

Index: content/public/test/mock_render_thread.h
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index b5e1550dea5c60d9c2b337af0456ddf5dd11c8f6..f1ebb4cdf931803b1dad3abf8a6a34f60d28ae7c 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -15,6 +15,7 @@
 #include "third_party/WebKit/public/web/WebPopupType.h"
 
 struct ViewHostMsg_CreateWindow_Params;
+struct ViewHostMsg_CreateWindow_Reply;
 
 namespace IPC {
 class MessageFilter;
@@ -98,6 +99,10 @@ class MockRenderThread : public RenderThread {
     new_window_routing_id_ = id;
   }
 
+  void set_new_window_main_frame_widget_routing_id(int32 id) {
+    new_window_main_frame_widget_routing_id_ = id;
+  }
+
   void set_new_frame_routing_id(int32 id) {
     new_frame_routing_id_ = id;
   }
@@ -123,15 +128,11 @@ class MockRenderThread : public RenderThread {
                       int* route_id,
                       int* surface_id);
 
-  // The View expects to be returned a valid route_id different from its own.
-  // We do not keep track of the newly created widget in MockRenderThread,
+  // The View expects to be returned a valid |reply.route_id| different from its
+  // own. We do not keep track of the newly created widget in MockRenderThread,
   // so it must be cleaned up on its own.
-  void OnCreateWindow(
-    const ViewHostMsg_CreateWindow_Params& params,
-    int* route_id,
-    int* main_frame_route_id,
-    int* surface_id,
-    int64* cloned_session_storage_namespace_id);
+  void OnCreateWindow(const ViewHostMsg_CreateWindow_Params& params,
+                      ViewHostMsg_CreateWindow_Reply* reply);
 
   // The Frame expects to be returned a valid route_id different from its own.
   void OnCreateChildFrame(int new_frame_routing_id,
@@ -159,6 +160,7 @@ class MockRenderThread : public RenderThread {
   // Routing id that will be assigned to a CreateWindow Widget.
   int32 new_window_routing_id_;
   int32 new_window_main_frame_routing_id_;
+  int32 new_window_main_frame_widget_routing_id_;
   int32 new_frame_routing_id_;
 
   // The last known good deserializer for sync messages.