Fork cc::OutputSurface into cc::CompositorFrameSink.

ui/compositor/test/in_process_context_factory.h

Index: ui/compositor/test/in_process_context_factory.h
diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h
index a6b53eb571df765380a21c6bcfa785060c27afe5..924d3dfe2f0437eb19e6c96715fdcb1722179201 100644
--- a/ui/compositor/test/in_process_context_factory.h
+++ b/ui/compositor/test/in_process_context_factory.h
@@ -46,7 +46,7 @@ class InProcessContextFactory : public ContextFactory {
   void SendOnLostResources();
 
   // ContextFactory implementation
-  void CreateOutputSurface(base::WeakPtr<Compositor> compositor) override;
+  void CreateCompositorFrameSink(base::WeakPtr<Compositor> compositor) override;
 
   std::unique_ptr<Reflector> CreateReflector(Compositor* mirrored_compositor,
                                              Layer* mirroring_layer) override;