Remove the concept of OutputSurface from ResourceProvider.

cc/test/layer_tree_pixel_resource_test.cc

 // 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.
 
 #include "cc/test/layer_tree_pixel_resource_test.h"
 
 #include "cc/layers/layer.h"
 #include "cc/raster/bitmap_raster_buffer_provider.h"
 #include "cc/raster/gpu_raster_buffer_provider.h"
 #include "cc/raster/gpu_rasterizer.h"
@@ skipping 98 matching lines @@
     LayerTreeHostImpl* host_impl,
     std::unique_ptr<RasterBufferProvider>* raster_buffer_provider,
     std::unique_ptr<ResourcePool>* resource_pool) {
   base::SingleThreadTaskRunner* task_runner =
       task_runner_provider()->HasImplThread()
           ? task_runner_provider()->ImplThreadTaskRunner()
           : task_runner_provider()->MainThreadTaskRunner();
   DCHECK(task_runner);
   DCHECK(initialized_);
 
-  ContextProvider* context_provider =
+  ContextProvider* compositor_context_provider =
       host_impl->output_surface()->context_provider();
+  ContextProvider* worker_context_provider =
+      host_impl->output_surface()->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;
 
   // Create resource pool.
   *resource_pool = ResourcePool::Create(resource_provider, task_runner);
 
   switch (raster_buffer_provider_type_) {
     case RASTER_BUFFER_PROVIDER_TYPE_BITMAP:
-      EXPECT_FALSE(context_provider);
+      EXPECT_FALSE(compositor_context_provider);
       EXPECT_EQ(PIXEL_TEST_SOFTWARE, test_type_);
 
       *raster_buffer_provider =
           BitmapRasterBufferProvider::Create(resource_provider);
       break;
     case RASTER_BUFFER_PROVIDER_TYPE_GPU:
-      EXPECT_TRUE(context_provider);
+      EXPECT_TRUE(compositor_context_provider);
+      EXPECT_TRUE(worker_context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
 
-      *raster_buffer_provider = GpuRasterBufferProvider::Create(
-          context_provider, resource_provider, false, 0);
+      *raster_buffer_provider = base::MakeUnique<GpuRasterBufferProvider>(
+          compositor_context_provider, worker_context_provider,
+          resource_provider, false, 0);
       break;
     case RASTER_BUFFER_PROVIDER_TYPE_ZERO_COPY:
-      EXPECT_TRUE(context_provider);
+      EXPECT_TRUE(compositor_context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
       EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
 
       *raster_buffer_provider = ZeroCopyRasterBufferProvider::Create(
           resource_provider, PlatformColor::BestTextureFormat());
       break;
     case RASTER_BUFFER_PROVIDER_TYPE_ONE_COPY:
-      EXPECT_TRUE(context_provider);
+      EXPECT_TRUE(compositor_context_provider);
+      EXPECT_TRUE(worker_context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
       EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
 
-      *raster_buffer_provider = OneCopyRasterBufferProvider::Create(
-          task_runner, context_provider, resource_provider,
-          max_bytes_per_copy_operation, false,
+      *raster_buffer_provider = base::MakeUnique<OneCopyRasterBufferProvider>(
+          task_runner, compositor_context_provider, worker_context_provider,
+          resource_provider, max_bytes_per_copy_operation, false,
           max_staging_buffer_usage_in_bytes,
           PlatformColor::BestTextureFormat());
       break;
   }
 }
 
 void LayerTreeHostPixelResourceTest::RunPixelResourceTest(
     scoped_refptr<Layer> content_root,
     base::FilePath file_name) {
   if (!IsTestCaseSupported(test_case_))
     return;
   RunPixelTest(test_type_, content_root, file_name);
 }
 
 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
     : LayerTreeHostPixelResourceTest(GetParam()) {
 }
 
 }  // namespace cc