WIP: Towards merging OffscreenCanvas and Mus code

content/browser/compositor/test/no_transport_image_transport_factory.h

Index: content/browser/compositor/test/no_transport_image_transport_factory.h
diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.h b/content/browser/compositor/test/no_transport_image_transport_factory.h
index 3961b4a7b16c18ec420751fa15d6b3ad84b0db6d..860bf1c8618a6e536f3a0b887677daf549447617 100644
--- a/content/browser/compositor/test/no_transport_image_transport_factory.h
+++ b/content/browser/compositor/test/no_transport_image_transport_factory.h
@@ -9,8 +9,11 @@
 
 #include "base/macros.h"
 #include "build/build_config.h"
+#include "cc/ipc/display_compositor.mojom.h"
 #include "cc/surfaces/surface_manager.h"
+#include "components/display_compositor/display_compositor.h"
 #include "content/browser/compositor/image_transport_factory.h"
+#include "mojo/public/cpp/bindings/binding.h"
 
 namespace cc {
 class ContextProvider;
@@ -23,7 +26,9 @@ class InProcessContextFactory;
 namespace content {
 
 // An ImageTransportFactory that disables transport.
-class NoTransportImageTransportFactory : public ImageTransportFactory {
+class NoTransportImageTransportFactory
+    : public ImageTransportFactory,
+      public cc::mojom::DisplayCompositorClient {
  public:
   NoTransportImageTransportFactory();
   ~NoTransportImageTransportFactory() override;
@@ -39,8 +44,15 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
                                         bool suspended) override {}
 #endif
 
+  // cc::mojom::DisplayCompositorClient:
+  void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override;
+
  private:
-  std::unique_ptr<cc::SurfaceManager> surface_manager_;
+  mojo::Binding<cc::mojom::DisplayCompositorClient>
+      display_compositor_client_binding_;
+  cc::mojom::DisplayCompositorPtr display_compositor_ptr_;
+  std::unique_ptr<display_compositor::DisplayCompositor> display_compositor_;
+
   std::unique_ptr<ui::InProcessContextFactory> context_factory_;
   scoped_refptr<cc::ContextProvider> context_provider_;
   std::unique_ptr<display_compositor::GLHelper> gl_helper_;