Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/tiles/picture_layer_tiling_set_unittest.cc

 // Copyright 2012 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.
 
 #include "cc/tiles/picture_layer_tiling_set.h"
 
 #include <map>
 #include <vector>
 
 #include "cc/resources/resource_provider.h"
@@ skipping 219 matching lines @@
   EXPECT_EQ(0u, lower_than_low_res_range.end - lower_than_low_res_range.start);
 }
 
 class PictureLayerTilingSetTestWithResources : public testing::Test {
  public:
   void RunTest(int num_tilings,
                float min_scale,
                float scale_increment,
                float ideal_contents_scale,
                float expected_scale) {
-    FakeOutputSurfaceClient output_surface_client;
-    std::unique_ptr<FakeOutputSurface> output_surface =
-        FakeOutputSurface::CreateDelegating3d();
-    CHECK(output_surface->BindToClient(&output_surface_client));
-
-    std::unique_ptr<SharedBitmapManager> shared_bitmap_manager(
-        new TestSharedBitmapManager());
+    scoped_refptr<TestContextProvider> context_provider =
+        TestContextProvider::Create();
+    ASSERT_TRUE(context_provider->BindToCurrentThread());
+    auto shared_bitmap_manager = base::MakeUnique<TestSharedBitmapManager>();
     std::unique_ptr<ResourceProvider> resource_provider =
-        FakeResourceProvider::Create(output_surface.get(),
+        FakeResourceProvider::Create(context_provider.get(),
                                      shared_bitmap_manager.get());
 
     FakePictureLayerTilingClient client(resource_provider.get());
     client.SetTileSize(gfx::Size(256, 256));
     gfx::Size layer_bounds(1000, 800);
     std::unique_ptr<TestablePictureLayerTilingSet> set =
         CreateTilingSet(&client);
     scoped_refptr<FakeRasterSource> raster_source =
         FakeRasterSource::CreateFilled(layer_bounds);
 
@@ skipping 723 matching lines @@
 
   // This will invalidate tilings.
   tiling_set->UpdateRasterSourceDueToLCDChange(raster_source, Region());
 
   EXPECT_TRUE(
       tiling_set->UpdateTilePriorities(viewport, 1.f, time, Occlusion(), true));
 }
 
 }  // namespace
 }  // namespace cc