Give the main frame a RenderWidget.

content/browser/renderer_host/render_widget_helper.h

Index: content/browser/renderer_host/render_widget_helper.h
diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h
index 7f4ad7ea5e2e187aa105ec6dd3ea1e91386f8ed8..ffa30964bedf8f224847a778b2762b6c6e8d87a3 100644
--- a/content/browser/renderer_host/render_widget_helper.h
+++ b/content/browser/renderer_host/render_widget_helper.h
@@ -99,14 +99,15 @@ class RenderWidgetHelper
 
   // IO THREAD ONLY -----------------------------------------------------------
 
-  void CreateNewWindow(
-      const ViewHostMsg_CreateWindow_Params& params,
-      bool no_javascript_access,
-      base::ProcessHandle render_process,
-      int* route_id,
-      int* main_frame_route_id,
-      int* surface_id,
-      SessionStorageNamespace* session_storage_namespace);
+  void CreateNewWindow(const ViewHostMsg_CreateWindow_Params& params,
+                       bool no_javascript_access,
+                       base::ProcessHandle render_process,
+                       int32* route_id,
+                       int32* surface_id,
+                       int32* main_frame_route_id,
+                       int32* main_frame_widget_route_id,
+                       int32* widget_surface_id,
+                       SessionStorageNamespace* session_storage_namespace);
   void CreateNewWidget(int opener_id,
                        blink::WebPopupType popup_type,
                        int* route_id,
@@ -121,11 +122,12 @@ class RenderWidgetHelper
   ~RenderWidgetHelper();
 
   // Called on the UI thread to finish creating a window.
-  void OnCreateWindowOnUI(
-      const ViewHostMsg_CreateWindow_Params& params,
-      int route_id,
-      int main_frame_route_id,
-      SessionStorageNamespace* session_storage_namespace);
+  void OnCreateWindowOnUI(const ViewHostMsg_CreateWindow_Params& params,
+                          int32 route_id,
+                          int32 main_frame_route_id,
+                          int32 main_frame_widget_route_id,
+                          int32 surface_id,
+                          SessionStorageNamespace* session_storage_namespace);
 
   // Called on the IO thread after a window was created on the UI thread.
   void OnResumeRequestsForView(int route_id);