Fork cc::OutputSurface into cc::CompositorFrameSink.

ui/compositor/test/in_process_context_factory.h

 // 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.
 
 #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
 #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
 
 #include <stdint.h>
 #include <memory>
 
@@ skipping 28 matching lines @@
   // anything. Set to false if you want to see results on the screen.
   void set_use_test_surface(bool use_test_surface) {
     use_test_surface_ = use_test_surface;
   }
 
   // This is used to call OnLostResources on all clients, to ensure they stop
   // using the SharedMainThreadContextProvider.
   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;
   void RemoveReflector(Reflector* reflector) override;
 
   scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
   void RemoveCompositor(Compositor* compositor) override;
   bool DoesCreateTestContexts() override;
   uint32_t GetImageTextureTarget(gfx::BufferFormat format,
                                  gfx::BufferUsage usage) override;
@@ skipping 31 matching lines @@
 
   base::hash_map<Compositor*, std::unique_ptr<cc::Display>>
       per_compositor_data_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_