WIP: Towards merging OffscreenCanvas and Mus code

content/browser/compositor/test/no_transport_image_transport_factory.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 "content/browser/compositor/test/no_transport_image_transport_factory.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "cc/output/context_provider.h"
 #include "cc/surfaces/surface_manager.h"
+#include "components/display_compositor/display_compositor.h"
 #include "components/display_compositor/gl_helper.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/in_process_context_factory.h"
 
 namespace content {
 
 NoTransportImageTransportFactory::NoTransportImageTransportFactory()
-    : surface_manager_(new cc::SurfaceManager),
-      // The context factory created here is for unit tests, thus passing in
-      // true in constructor.
-      context_factory_(
-          new ui::InProcessContextFactory(true, surface_manager_.get())) {}
+    : display_compositor_client_binding_(this) {
+  display_compositor_ = base::MakeUnique<display_compositor::DisplayCompositor>(
+      MakeRequest(&display_compositor_ptr_),
+      display_compositor_client_binding_.CreateInterfacePtrAndBind());
+
+  // The context factory created here is for unit tests, thus passing in
+  // true in constructor.
+  context_factory_ = base::MakeUnique<ui::InProcessContextFactory>(
+      true, display_compositor_.get());
+}
 
 NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {
   std::unique_ptr<display_compositor::GLHelper> lost_gl_helper =
       std::move(gl_helper_);
   context_factory_->SendOnLostResources();
 }
 
 ui::ContextFactory* NoTransportImageTransportFactory::GetContextFactory() {
   return context_factory_.get();
 }
 
 ui::ContextFactoryPrivate*
 NoTransportImageTransportFactory::GetContextFactoryPrivate() {
   return context_factory_.get();
 }
 
 display_compositor::GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
   if (!gl_helper_) {
     context_provider_ = context_factory_->SharedMainThreadContextProvider();
     gl_helper_.reset(new display_compositor::GLHelper(
         context_provider_->ContextGL(), context_provider_->ContextSupport()));
   }
   return gl_helper_.get();
 }
 
 void NoTransportImageTransportFactory::SetGpuChannelEstablishFactory(
     gpu::GpuChannelEstablishFactory* factory) {}
 
+void NoTransportImageTransportFactory::OnSurfaceCreated(
+    const cc::SurfaceInfo& surface_info) {}
+
 }  // namespace content