Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm

Index: content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
index 98ee45a564836b9e35b80fe29395b2140a10d1e2..a6af135f76bb1c9a99a7d31393ededc3a05cbb69 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
@@ -10,7 +10,6 @@
 #include "base/message_loop/message_loop.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/gpu/compositor_util.h"
-#include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/input_messages.h"
@@ -87,9 +86,8 @@ class RenderWidgetHostEditCommandCounter : public RenderWidgetHostImpl {
  public:
   RenderWidgetHostEditCommandCounter(RenderWidgetHostDelegate* delegate,
                                      RenderProcessHost* process,
-                                     int32 routing_id,
-                                     int32 surface_id)
-      : RenderWidgetHostImpl(delegate, process, routing_id, surface_id, false),
+                                     int32 routing_id)
+      : RenderWidgetHostImpl(delegate, process, routing_id, false),
         edit_command_message_count_(0) {}
 
   bool Send(IPC::Message* message) override {
@@ -127,11 +125,9 @@ TEST_F(RenderWidgetHostViewMacEditCommandHelperTest,
   ui::test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
 
   int32 routing_id = process_host.GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host.GetID(), routing_id);
   RenderWidgetHostEditCommandCounter* render_widget =
       new RenderWidgetHostEditCommandCounter(&delegate, &process_host,
-                                             routing_id, surface_id);
+                                             routing_id);
 
   base::mac::ScopedNSAutoreleasePool pool;