Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/fake_compositor_frame_sink_client.h

Index: cc/test/fake_compositor_frame_sink_client.h
diff --git a/cc/test/fake_output_surface_client.h b/cc/test/fake_compositor_frame_sink_client.h
similarity index 68%
copy from cc/test/fake_output_surface_client.h
copy to cc/test/fake_compositor_frame_sink_client.h
index 0bc6e38c4f697b8e44f5a7c39b5c5802d201d52d..e50c2d755de7329134be41a1975153f25621cb4b 100644
--- a/cc/test/fake_output_surface_client.h
+++ b/cc/test/fake_compositor_frame_sink_client.h
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_TEST_FAKE_OUTPUT_SURFACE_CLIENT_H_
-#define CC_TEST_FAKE_OUTPUT_SURFACE_CLIENT_H_
+#ifndef CC_TEST_FAKE_COMPOSITOR_FRAME_SINK_CLIENT_H_
+#define CC_TEST_FAKE_COMPOSITOR_FRAME_SINK_CLIENT_H_
 
+#include "cc/output/compositor_frame_sink_client.h"
 #include "cc/output/managed_memory_policy.h"
-#include "cc/output/output_surface_client.h"
 
 namespace cc {
 
-class OutputSurface;
+class CompositorFrameSink;
 
-class FakeOutputSurfaceClient : public OutputSurfaceClient {
+class FakeCompositorFrameSinkClient : public CompositorFrameSinkClient {
  public:
-  FakeOutputSurfaceClient()
+  FakeCompositorFrameSinkClient()
       : swap_count_(0),
-        did_lose_output_surface_called_(false),
+        did_lose_compositor_frame_sink_called_(false),
         memory_policy_(0) {}
 
   void SetBeginFrameSource(BeginFrameSource* source) override {}
@@ -25,7 +25,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
   void DidReceiveTextureInUseResponses(
       const gpu::TextureInUseResponses& responses) override {}
   void ReclaimResources(const ReturnedResourceArray& resources) override {}
-  void DidLoseOutputSurface() override;
+  void DidLoseCompositorFrameSink() override;
   void SetExternalTilePriorityConstraints(
       const gfx::Rect& viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override {}
@@ -37,18 +37,18 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
 
   int swap_count() { return swap_count_; }
 
-  bool did_lose_output_surface_called() {
-    return did_lose_output_surface_called_;
+  bool did_lose_compositor_frame_sink_called() {
+    return did_lose_compositor_frame_sink_called_;
   }
 
   const ManagedMemoryPolicy& memory_policy() const { return memory_policy_; }
 
  private:
   int swap_count_;
-  bool did_lose_output_surface_called_;
+  bool did_lose_compositor_frame_sink_called_;
   ManagedMemoryPolicy memory_policy_;
 };
 
 }  // namespace cc
 
-#endif  // CC_TEST_FAKE_OUTPUT_SURFACE_CLIENT_H_
+#endif  // CC_TEST_FAKE_COMPOSITOR_FRAME_SINK_CLIENT_H_