Give the main frame a RenderWidget.

content/public/test/mock_render_thread.cc

Index: content/public/test/mock_render_thread.cc
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index dee8514b68c6108e252a3bf5b467c706dac67f61..cdd1a37f44e834264e3f5a149f6780f4f24f51eb 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -24,8 +24,8 @@ MockRenderThread::MockRenderThread()
       opener_id_(0),
       new_window_routing_id_(0),
       new_window_main_frame_routing_id_(0),
-      new_frame_routing_id_(0) {
-}
+      new_window_main_frame_widget_routing_id_(0),
+      new_frame_routing_id_(0) {}
 
 MockRenderThread::~MockRenderThread() {
   while (!filters_.empty()) {
@@ -215,14 +215,13 @@ void MockRenderThread::OnCreateWidget(int opener_id,
 // The View expects to be returned a valid route_id different from its own.
 void MockRenderThread::OnCreateWindow(
     const ViewHostMsg_CreateWindow_Params& params,
-    int* route_id,
-    int* main_frame_route_id,
-    int* surface_id,
-    int64* cloned_session_storage_namespace_id) {
-  *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;
+    ViewHostMsg_CreateWindow_Reply* reply) {
+  reply->route_id = new_window_routing_id_;
+  reply->surface_id = surface_id_;
+  reply->main_frame_route_id = new_window_main_frame_routing_id_;
+  reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_;
+  reply->widget_surface_id = surface_id_ + 1;

[ncarter (slow), 2015/09/03 20:24:37]

How much of a hack is this +1?

[dcheng, 2015/09/03 21:29:24]

I'd say it's a moderate hack, but it seems to work. I personally preferred this
appraoch over having to plumb two surface IDs everywhere and then removing it
later.

+  reply->cloned_session_storage_namespace_id = 0;
 }
 
 // The Frame expects to be returned a valid route_id different from its own.