Fork cc::OutputSurface into cc::CompositorFrameSink.

content/test/test_render_view_host.cc

 // 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.
 
 #include "content/test/test_render_view_host.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 198 matching lines @@
 void TestRenderWidgetHostView::StopSpeaking() {
 }
 
 #endif
 
 gfx::Rect TestRenderWidgetHostView::GetBoundsInRootWindow() {
   return gfx::Rect();
 }
 
 void TestRenderWidgetHostView::OnSwapCompositorFrame(
-    uint32_t output_surface_id,
+    uint32_t compositor_frame_sink_id,
     cc::CompositorFrame frame) {
   did_swap_compositor_frame_ = true;
 }
 
 bool TestRenderWidgetHostView::LockMouse() {
   return false;
 }
 
 void TestRenderWidgetHostView::UnlockMouse() {
 }
@@ skipping 121 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content