Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/frame_host/render_widget_host_view_child_frame_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_child_frame.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_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/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/frame_host/cross_process_frame_connector.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/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 "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
@@ skipping 56 matching lines @@
 
 // ImageTransportFactory doesn't exist on Android.
 #if !defined(OS_ANDROID)
     ImageTransportFactory::InitializeForUnitTests(
         make_scoped_ptr(new NoTransportImageTransportFactory));
 #endif
 
     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 RenderWidgetHostViewChildFrame(widget_host_);
 
     test_frame_connector_ = new MockCrossProcessFrameConnector();
     view_->set_cross_process_frame_connector(test_frame_connector_);
   }
 
   void TearDown() override {
     if (view_)
       view_->Destroy();
     delete widget_host_;
@@ skipping 80 matching lines @@
                 test_frame_connector_->last_scale_factor_received_);
     }
   } else {
     EXPECT_TRUE(test_frame_connector_->received_delegated_frame_);
     EXPECT_EQ(view_size, test_frame_connector_->last_frame_size_received_);
     EXPECT_EQ(scale_factor, test_frame_connector_->last_scale_factor_received_);
   }
 }
 
 }  // namespace content