Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/renderer_host/text_input_client_mac_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "content/browser/renderer_host/text_input_client_mac.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
-#include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/text_input_client_message_filter.h"
 #include "content/common/text_input_client_messages.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
@@ skipping 21 matching lines @@
 class TextInputClientMacTest : public testing::Test {
  public:
   TextInputClientMacTest()
       : browser_context_(),
         process_factory_(),
         delegate_(),
         thread_("TextInputClientMacTestThread") {
     RenderProcessHost* rph =
         process_factory_.CreateRenderProcessHost(&browser_context_, nullptr);
     int32 routing_id = rph->GetNextRoutingID();
-    int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-        rph->GetID(), routing_id);
-    widget_.reset(new RenderWidgetHostImpl(&delegate_, rph, routing_id,
-                                           surface_id, false));
+    widget_.reset(new RenderWidgetHostImpl(&delegate_, rph, routing_id, false));
   }
 
   // Accessor for the TextInputClientMac instance.
   TextInputClientMac* service() {
     return TextInputClientMac::GetInstance();
   }
 
   // Helper method to post a task on the testing thread's MessageLoop after
   // a short delay.
   void PostTask(const tracked_objects::Location& from_here,
@@ skipping 132 matching lines @@
 
 TEST_F(TextInputClientMacTest, TimeoutRectForRange) {
   NSRect rect = service()->GetFirstRectForRange(widget(), NSMakeRange(0, 32));
   EXPECT_EQ(1U, ipc_sink().message_count());
   EXPECT_TRUE(ipc_sink().GetUniqueMessageMatching(
       TextInputClientMsg_FirstRectForCharacterRange::ID));
   EXPECT_NSEQ(NSZeroRect, rect);
 }
 
 }  // namespace content