Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/test_hooks.h

Index: cc/test/test_hooks.h
diff --git a/cc/test/test_hooks.h b/cc/test/test_hooks.h
index b3be213004438ff8526bd46eea1a4e98357cb496..1aa20a10809c959e1cd157fa8efd1855cc337c31 100644
--- a/cc/test/test_hooks.h
+++ b/cc/test/test_hooks.h
@@ -85,8 +85,8 @@ class TestHooks : public AnimationDelegate {
   virtual void WillBeginMainFrame() {}
   virtual void DidBeginMainFrame() {}
   virtual void UpdateLayerTreeHost() {}
-  virtual void DidInitializeOutputSurface() {}
-  virtual void DidFailToInitializeOutputSurface() {}
+  virtual void DidInitializeCompositorFrameSink() {}
+  virtual void DidFailToInitializeCompositorFrameSink() {}
   virtual void DidAddAnimation() {}
   virtual void WillCommit() {}
   virtual void DidCommit() {}
@@ -111,7 +111,7 @@ class TestHooks : public AnimationDelegate {
                                std::unique_ptr<AnimationCurve> curve) override {
   }
 
-  virtual void RequestNewOutputSurface() = 0;
+  virtual void RequestNewCompositorFrameSink() = 0;
 };
 
 }  // namespace cc