Give the main frame a RenderWidget.

content/browser/renderer_host/render_widget_helper.cc

Index: content/browser/renderer_host/render_widget_helper.cc
diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc
index 4bd7af0a1212c127f8b18f55bf4399836930ab0d..cc57b1ce4edd49ce39a9cfc2145601f99a9af88d 100644
--- a/content/browser/renderer_host/render_widget_helper.cc
+++ b/content/browser/renderer_host/render_widget_helper.cc
@@ -104,9 +104,10 @@ void RenderWidgetHelper::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,
+    int32* route_id,
+    int32* main_frame_route_id,
+    int32* main_frame_widget_route_id,
+    int32* surface_id,
     SessionStorageNamespace* session_storage_namespace) {
   if (params.opener_suppressed || no_javascript_access) {
     // If the opener is supppressed or script access is disallowed, we should
@@ -116,10 +117,12 @@ void RenderWidgetHelper::CreateNewWindow(
     // in OnCreateWindowOnUI, using the params provided here.
     *route_id = MSG_ROUTING_NONE;
     *main_frame_route_id = MSG_ROUTING_NONE;
+    *main_frame_widget_route_id = MSG_ROUTING_NONE;
     *surface_id = 0;
   } else {
     *route_id = GetNextRoutingID();
     *main_frame_route_id = GetNextRoutingID();
+    *main_frame_widget_route_id = GetNextRoutingID();
     *surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
         render_process_id_, *route_id);
     // Block resource requests until the view is created, since the HWND might
@@ -132,21 +135,23 @@ void RenderWidgetHelper::CreateNewWindow(
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI,
-                 this, params, *route_id, *main_frame_route_id,
+      base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI, this, params,
+                 *route_id, *main_frame_route_id, *main_frame_widget_route_id,
                  make_scoped_refptr(session_storage_namespace)));
 }
 
 void RenderWidgetHelper::OnCreateWindowOnUI(
     const ViewHostMsg_CreateWindow_Params& params,
-    int route_id,
-    int main_frame_route_id,
+    int32 route_id,
+    int32 main_frame_route_id,
+    int32 main_frame_widget_route_id,
     SessionStorageNamespace* session_storage_namespace) {
   RenderViewHostImpl* host =
       RenderViewHostImpl::FromID(render_process_id_, params.opener_id);
   if (host)
-    host->CreateNewWindow(route_id, main_frame_route_id, params,
-        session_storage_namespace);
+    host->CreateNewWindow(route_id, main_frame_route_id,
+                          main_frame_widget_route_id, params,
+                          session_storage_namespace);
 }
 
 void RenderWidgetHelper::OnResumeRequestsForView(int route_id) {