WIP: Towards merging OffscreenCanvas and Mus code

ui/compositor/test/in_process_context_factory.cc

Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 0a5be65e9fa2348b8cd73284239acb861ecfc957..8f97049c7fe363946486a93456a5f0a4fc36cfef 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -22,6 +22,7 @@
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/test/pixel_test_output_surface.h"
+#include "components/display_compositor/display_compositor.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ -128,12 +129,12 @@ struct InProcessContextFactory::PerCompositorData {
 
 InProcessContextFactory::InProcessContextFactory(
     bool context_factory_for_test,
-    cc::SurfaceManager* surface_manager)
+    display_compositor::DisplayCompositor* display_compositor)
     : next_surface_sink_id_(1u),
       use_test_surface_(true),
       context_factory_for_test_(context_factory_for_test),
-      surface_manager_(surface_manager) {
-  DCHECK(surface_manager);
+      display_compositor_(display_compositor) {
+  DCHECK(display_compositor);
   DCHECK_NE(gl::GetGLImplementation(), gl::kGLImplementationNone)
       << "If running tests, ensure that main() is calling "
       << "gl::GLSurfaceTestSupport::InitializeOneOff()";
@@ -219,9 +220,9 @@ void InProcessContextFactory::CreateCompositorFrameSink(
 
   auto* display = per_compositor_data_[compositor.get()]->display.get();
   auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
-      compositor->frame_sink_id(), surface_manager_, display, context_provider,
-      shared_worker_context_provider_, &gpu_memory_buffer_manager_,
-      &shared_bitmap_manager_);
+      compositor->frame_sink_id(), display_compositor_->surface_manager(),
+      display, context_provider, shared_worker_context_provider_,
+      &gpu_memory_buffer_manager_, &shared_bitmap_manager_);
   compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
 
   data->display->Resize(compositor->size());
@@ -294,7 +295,12 @@ cc::FrameSinkId InProcessContextFactory::AllocateFrameSinkId() {
 }
 
 cc::SurfaceManager* InProcessContextFactory::GetSurfaceManager() {
-  return surface_manager_;
+  return display_compositor_->surface_manager();
+}
+
+display_compositor::DisplayCompositor*
+InProcessContextFactory::GetDisplayCompositor() {
+  return display_compositor_;
 }
 
 void InProcessContextFactory::SetDisplayVisible(ui::Compositor* compositor,