Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/media/capture/web_contents_video_capture_device_unittest.cc

Index: content/browser/media/capture/web_contents_video_capture_device_unittest.cc
diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
index d0c7a8859b48c260d65e60594013822826f50013..ec80ea0791379d5397f4f30717c9a9ed60c27ce9 100644
--- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
@@ -248,7 +248,6 @@ class CaptureTestRenderViewHost : public TestRenderViewHost {
                             RenderViewHostDelegate* delegate,
                             RenderWidgetHostDelegate* widget_delegate,
                             int32 routing_id,
-                            int32 surface_id,
                             int32 main_frame_routing_id,
                             bool swapped_out,
                             CaptureTestSourceController* controller)
@@ -256,7 +255,6 @@ class CaptureTestRenderViewHost : public TestRenderViewHost {
                            delegate,
                            widget_delegate,
                            routing_id,
-                           surface_id,
                            main_frame_routing_id,
                            swapped_out),
         controller_(controller) {
@@ -313,12 +311,11 @@ class CaptureTestRenderViewHostFactory : public RenderViewHostFactory {
       RenderViewHostDelegate* delegate,
       RenderWidgetHostDelegate* widget_delegate,
       int32 routing_id,
-      int32 surface_id,
       int32 main_frame_routing_id,
       bool swapped_out) override {
-    return new CaptureTestRenderViewHost(
-        instance, delegate, widget_delegate, routing_id, surface_id,
-        main_frame_routing_id, swapped_out, controller_);
+    return new CaptureTestRenderViewHost(instance, delegate, widget_delegate,
+                                         routing_id, main_frame_routing_id,
+                                         swapped_out, controller_);
   }
  private:
   CaptureTestSourceController* controller_;