Remove surface_id from RenderWidget/RenderWidgetHost and friends

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 2d6fd6edc4b849a630cb663788712277fd4a4d3b..a3edec4f850575d9e6eb8acc362f57ff7b5ae5e8 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -20,7 +20,6 @@ namespace content {
 
 MockRenderThread::MockRenderThread()
     : routing_id_(0),
-      surface_id_(0),
       opener_id_(0),
       new_window_routing_id_(0),
       new_window_main_frame_routing_id_(0),
@@ -201,11 +200,9 @@ void MockRenderThread::SendCloseMessage() {
 // The Widget expects to be returned valid route_id.
 void MockRenderThread::OnCreateWidget(int opener_id,
                                       blink::WebPopupType popup_type,
-                                      int* route_id,
-                                      int* surface_id) {
+                                      int* route_id) {
   opener_id_ = opener_id;
   *route_id = routing_id_;
-  *surface_id = surface_id_;
 }
 
 // The View expects to be returned a valid route_id different from its own.
@@ -213,11 +210,9 @@ 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;
 }