Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/frame_host/render_widget_host_view_guest_unittest.cc

 // Copyright 2014 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.
 
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.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/view_messages.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 20 matching lines @@
   void SetUp() override {
 #if !defined(OS_ANDROID)
     ImageTransportFactory::InitializeForUnitTests(
         scoped_ptr<ImageTransportFactory>(
             new NoTransportImageTransportFactory));
 #endif
     browser_context_.reset(new TestBrowserContext);
     MockRenderProcessHost* process_host =
         new MockRenderProcessHost(browser_context_.get());
     int32 routing_id = process_host->GetNextRoutingID();
-    int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-        process_host->GetID(), routing_id);
-    widget_host_ = new RenderWidgetHostImpl(&delegate_, process_host,
-                                            routing_id, surface_id, false);
+    widget_host_ =
+        new RenderWidgetHostImpl(&delegate_, process_host, routing_id, false);
     view_ = new RenderWidgetHostViewGuest(
         widget_host_, NULL,
         (new TestRenderWidgetHostView(widget_host_))->GetWeakPtr());
   }
 
   void TearDown() override {
     if (view_)
       view_->Destroy();
     delete widget_host_;
 
@@ skipping 106 matching lines @@
     browser_context_.reset(new TestBrowserContext);
     MockRenderProcessHost* process_host =
         new MockRenderProcessHost(browser_context_.get());
     web_contents_.reset(
         TestWebContents::Create(browser_context_.get(), nullptr));
     // We don't own the BPG, the WebContents does.
     browser_plugin_guest_ = new TestBrowserPluginGuest(
         web_contents_.get(), &browser_plugin_guest_delegate_);
 
     int32 routing_id = process_host->GetNextRoutingID();
-    int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-        process_host->GetID(), routing_id);
-    widget_host_ = new RenderWidgetHostImpl(&delegate_, process_host,
-                                            routing_id, surface_id, false);
+    widget_host_ =
+        new RenderWidgetHostImpl(&delegate_, process_host, routing_id, false);
     view_ = new RenderWidgetHostViewGuest(
         widget_host_, browser_plugin_guest_,
         (new TestRenderWidgetHostView(widget_host_))->GetWeakPtr());
   }
 
   void TearDown() override {
     if (view_)
       view_->Destroy();
     delete widget_host_;
 
@@ skipping 115 matching lines @@
   browser_plugin_guest_->set_attached(false);
   browser_plugin_guest_->ResetTestData();
 
   view_->OnSwapCompositorFrame(
       0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
   if (UseSurfacesEnabled())
     EXPECT_TRUE(surface_id().is_null());
 }
 
 }  // namespace content