Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/raster/raster_buffer_provider_unittest.cc

Index: cc/raster/raster_buffer_provider_unittest.cc
diff --git a/cc/raster/raster_buffer_provider_unittest.cc b/cc/raster/raster_buffer_provider_unittest.cc
index a2aeeebe62e1417e7437a2b8b1a84e63b0d017a9..32b1fe83fe4b103572d61c4f9d8f30b86f05ff9a 100644
--- a/cc/raster/raster_buffer_provider_unittest.cc
+++ b/cc/raster/raster_buffer_provider_unittest.cc
@@ -162,12 +162,12 @@ class RasterBufferProviderTest
   void SetUp() override {
     switch (GetParam()) {
       case RASTER_BUFFER_PROVIDER_TYPE_ZERO_COPY:
-        Create3dOutputSurfaceAndResourceProvider();
+        Create3dResourceProvider();
         raster_buffer_provider_ = ZeroCopyRasterBufferProvider::Create(
             resource_provider_.get(), PlatformColor::BestTextureFormat());
         break;
       case RASTER_BUFFER_PROVIDER_TYPE_ONE_COPY:
-        Create3dOutputSurfaceAndResourceProvider();
+        Create3dResourceProvider();
         raster_buffer_provider_ = base::MakeUnique<OneCopyRasterBufferProvider>(
             base::ThreadTaskRunnerHandle::Get().get(), context_provider_.get(),
             worker_context_provider_.get(), resource_provider_.get(),
@@ -175,13 +175,13 @@ class RasterBufferProviderTest
             PlatformColor::BestTextureFormat(), false);
         break;
       case RASTER_BUFFER_PROVIDER_TYPE_GPU:
-        Create3dOutputSurfaceAndResourceProvider();
+        Create3dResourceProvider();
         raster_buffer_provider_ = base::MakeUnique<GpuRasterBufferProvider>(
             context_provider_.get(), worker_context_provider_.get(),
             resource_provider_.get(), false, 0, false);
         break;
       case RASTER_BUFFER_PROVIDER_TYPE_BITMAP:
-        CreateSoftwareOutputSurfaceAndResourceProvider();
+        CreateSoftwareResourceProvider();
         raster_buffer_provider_ =
             BitmapRasterBufferProvider::Create(resource_provider_.get());
         break;
@@ -279,22 +279,17 @@ class RasterBufferProviderTest
   }
 
  private:
-  void Create3dOutputSurfaceAndResourceProvider() {
-    output_surface_ = FakeOutputSurface::Create3d(context_provider_,
-                                                  worker_context_provider_);
-    CHECK(output_surface_->BindToClient(&output_surface_client_));
+  void Create3dResourceProvider() {
     TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d();
     context3d->set_support_sync_query(true);
     resource_provider_ = FakeResourceProvider::Create(
-        output_surface_.get(), nullptr, &gpu_memory_buffer_manager_);
+        context_provider_.get(), &shared_bitmap_manager_,
+        &gpu_memory_buffer_manager_);
   }
 
-  void CreateSoftwareOutputSurfaceAndResourceProvider() {
-    output_surface_ = FakeOutputSurface::CreateSoftware(
-        base::WrapUnique(new SoftwareOutputDevice));
-    CHECK(output_surface_->BindToClient(&output_surface_client_));
+  void CreateSoftwareResourceProvider() {
     resource_provider_ = FakeResourceProvider::Create(
-        output_surface_.get(), &shared_bitmap_manager_, nullptr);
+        nullptr, &shared_bitmap_manager_, &gpu_memory_buffer_manager_);
   }
 
   void OnTimeout() {