Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/layer_tree_pixel_resource_test.cc

Index: cc/test/layer_tree_pixel_resource_test.cc
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index d961c4cd24787605e6661d30adfe022c636d75de..9117b2b7e13d9c2d57ca014417c7094388a685ff 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -11,7 +11,6 @@
 #include "cc/raster/raster_buffer_provider.h"
 #include "cc/raster/zero_copy_raster_buffer_provider.h"
 #include "cc/resources/resource_pool.h"
-#include "cc/test/fake_output_surface.h"
 #include "gpu/GLES2/gl2extchromium.h"
 
 namespace cc {
@@ -116,9 +115,9 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndRasterBufferProvider(
   DCHECK(initialized_);
 
   ContextProvider* compositor_context_provider =
-      host_impl->output_surface()->context_provider();
+      host_impl->compositor_frame_sink()->context_provider();
   ContextProvider* worker_context_provider =
-      host_impl->output_surface()->worker_context_provider();
+      host_impl->compositor_frame_sink()->worker_context_provider();
   ResourceProvider* resource_provider = host_impl->resource_provider();
   int max_bytes_per_copy_operation = 1024 * 1024;
   int max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024;