Convert offscreen canvas to use FrameSinkManagerHost.

content/browser/renderer_host/offscreen_canvas_provider_impl.h

Index: content/browser/renderer_host/offscreen_canvas_provider_impl.h
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_factory_impl.h b/content/browser/renderer_host/offscreen_canvas_provider_impl.h
similarity index 37%
rename from content/browser/renderer_host/offscreen_canvas_surface_factory_impl.h
rename to content/browser/renderer_host/offscreen_canvas_provider_impl.h
index 879e0019a2407f48880d480b830a6f0b0b40fec4..be2c52c4f9b7cded9a56f0b25c642537b4f6a88b 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_factory_impl.h
+++ b/content/browser/renderer_host/offscreen_canvas_provider_impl.h
@@ -2,34 +2,41 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_SURFACE_FACTORY_IMPL_H_
-#define CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_SURFACE_FACTORY_IMPL_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_PROVIDER_IMPL_H_
+#define CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_PROVIDER_IMPL_H_
 
-#include "cc/ipc/frame_sink_manager.mojom.h"
+#include "cc/surfaces/frame_sink_id.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 #include "third_party/WebKit/public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom.h"
 
 namespace content {
 
-class OffscreenCanvasSurfaceFactoryImpl
-    : public blink::mojom::OffscreenCanvasSurfaceFactory {
+// Creates OffscreenCanvasSurfaces and MojoCompositorFrameSinks for a renderer.
+class OffscreenCanvasProviderImpl
+    : public blink::mojom::OffscreenCanvasProvider {
  public:
-  OffscreenCanvasSurfaceFactoryImpl() {}
-  ~OffscreenCanvasSurfaceFactoryImpl() override {}
+  OffscreenCanvasProviderImpl();
+  ~OffscreenCanvasProviderImpl() override;
 
-  static void Create(
-      blink::mojom::OffscreenCanvasSurfaceFactoryRequest request);
+  void Add(blink::mojom::OffscreenCanvasProviderRequest request);
 
-  // blink::mojom::OffscreenCanvasSurfaceFactory implementation.
+  // blink::mojom::OffscreenCanvasProvider implementation.
   void CreateOffscreenCanvasSurface(
       const cc::FrameSinkId& parent_frame_sink_id,
       const cc::FrameSinkId& frame_sink_id,
       cc::mojom::FrameSinkManagerClientPtr client,
       blink::mojom::OffscreenCanvasSurfaceRequest request) override;
+  void CreateCompositorFrameSink(
+      const cc::FrameSinkId& frame_sink_id,
+      cc::mojom::MojoCompositorFrameSinkClientPtr client,
+      cc::mojom::MojoCompositorFrameSinkRequest request) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(OffscreenCanvasSurfaceFactoryImpl);
+  mojo::BindingSet<blink::mojom::OffscreenCanvasProvider> bindings_;
+
+  DISALLOW_COPY_AND_ASSIGN(OffscreenCanvasProviderImpl);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_SURFACE_FACTORY_IMPL_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_PROVIDER_IMPL_H_