Reintroduce OffscreenCanvasSurfaceClient interface.

content/browser/renderer_host/offscreen_canvas_surface_impl.h

Index: content/browser/renderer_host/offscreen_canvas_surface_impl.h
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_impl.h b/content/browser/renderer_host/offscreen_canvas_surface_impl.h
index 3f76a2b41cf6632702c485fce1fb11a6984505bf..14d4b0a439c3e0eb71ccbde8e9133b5b36b00bae 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_impl.h
+++ b/content/browser/renderer_host/offscreen_canvas_surface_impl.h
@@ -5,7 +5,6 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_SURFACE_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_SURFACE_IMPL_H_
 
-#include "cc/ipc/frame_sink_manager.mojom.h"
 #include "cc/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "third_party/WebKit/public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom.h"
@@ -17,14 +16,15 @@ namespace content {
 class CONTENT_EXPORT OffscreenCanvasSurfaceImpl
     : public blink::mojom::OffscreenCanvasSurface {
  public:
-  OffscreenCanvasSurfaceImpl(const cc::FrameSinkId& parent_frame_sink_id,
-                             const cc::FrameSinkId& frame_sink_id,
-                             cc::mojom::FrameSinkManagerClientPtr client);
+  OffscreenCanvasSurfaceImpl(
+      const cc::FrameSinkId& parent_frame_sink_id,
+      const cc::FrameSinkId& frame_sink_id,
+      blink::mojom::OffscreenCanvasSurfaceClientPtr client);
   ~OffscreenCanvasSurfaceImpl() override;
 
   static void Create(const cc::FrameSinkId& parent_frame_sink_id,
                      const cc::FrameSinkId& frame_sink_id,
-                     cc::mojom::FrameSinkManagerClientPtr client,
+                     blink::mojom::OffscreenCanvasSurfaceClientPtr client,
                      blink::mojom::OffscreenCanvasSurfaceRequest request);
 
   // Creates a MojoCompositorFrameSink connection to FrameSinkManager for an
@@ -53,7 +53,7 @@ class CONTENT_EXPORT OffscreenCanvasSurfaceImpl
   }
 
  private:
-  cc::mojom::FrameSinkManagerClientPtr client_;
+  blink::mojom::OffscreenCanvasSurfaceClientPtr client_;
   mojo::StrongBindingPtr<blink::mojom::OffscreenCanvasSurface> binding_;
 
   // Private connection for the CompositorFrameSink. The CompositorFrameSink