Remove the concept of OutputSurface from ResourceProvider.

cc/test/fake_resource_provider.h

Index: cc/test/fake_resource_provider.h
diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h
index 447af561561a84c082d18b3dc6ee526c99c56953..f28a3db3c6cd845f5c63a6027f43985b9603252d 100644
--- a/cc/test/fake_resource_provider.h
+++ b/cc/test/fake_resource_provider.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include "base/memory/ptr_util.h"
 #include "cc/resources/resource_provider.h"
 #include "ui/gfx/buffer_types.h"
 
@@ -17,25 +18,22 @@ class FakeResourceProvider : public ResourceProvider {
   static std::unique_ptr<FakeResourceProvider> Create(
       OutputSurface* output_surface,
       SharedBitmapManager* shared_bitmap_manager) {
-    std::unique_ptr<FakeResourceProvider> provider(new FakeResourceProvider(
-        output_surface, shared_bitmap_manager, nullptr, nullptr, 0, 1, false,
+    return base::WrapUnique(new FakeResourceProvider(
+        output_surface, shared_bitmap_manager, nullptr, nullptr, 0, 1, true,
+        false,
         std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
                               GL_TEXTURE_2D)));
-    provider->Initialize();
-    return provider;
   }
 
   static std::unique_ptr<FakeResourceProvider> Create(
       OutputSurface* output_surface,
       SharedBitmapManager* shared_bitmap_manager,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
-    std::unique_ptr<FakeResourceProvider> provider(new FakeResourceProvider(
+    return base::WrapUnique(new FakeResourceProvider(
         output_surface, shared_bitmap_manager, gpu_memory_buffer_manager,
-        nullptr, 0, 1, false,
+        nullptr, 0, 1, true, false,
         std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
                               GL_TEXTURE_2D)));
-    provider->Initialize();
-    return provider;
   }
 
  private:
@@ -45,14 +43,18 @@ class FakeResourceProvider : public ResourceProvider {
                        BlockingTaskRunner* blocking_main_thread_task_runner,
                        int highp_threshold_min,
                        size_t id_allocation_chunk_size,
+                       bool delegated_sync_points_required,
                        bool use_gpu_memory_buffer_resources,
                        const std::vector<unsigned>& use_image_texture_targets)
-      : ResourceProvider(output_surface,
+      : ResourceProvider(output_surface->context_provider(),  // TODO(danakj):
+                                                              // Remove output
+                                                              // surface dep
                          shared_bitmap_manager,
                          gpu_memory_buffer_manager,
                          blocking_main_thread_task_runner,
                          highp_threshold_min,
                          id_allocation_chunk_size,
+                         delegated_sync_points_required,
                          use_gpu_memory_buffer_resources,
                          use_image_texture_targets) {}
 };