WIP: Towards merging OffscreenCanvas and Mus code

ui/compositor/test/in_process_context_factory.h

Index: ui/compositor/test/in_process_context_factory.h
diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h
index 72924b66e63df6084f63884206662727338ad9af..017b623fe62aa48d694aa84d5490284b361d0b8b 100644
--- a/ui/compositor/test/in_process_context_factory.h
+++ b/ui/compositor/test/in_process_context_factory.h
@@ -29,8 +29,9 @@ class InProcessContextFactory : public ContextFactory,
  public:
   // surface_manager is owned by the creator of this and must outlive the
   // context factory.
-  InProcessContextFactory(bool context_factory_for_test,
-                          cc::SurfaceManager* surface_manager);
+  InProcessContextFactory(
+      bool context_factory_for_test,
+      display_compositor::DisplayCompositor* display_compositor);
   ~InProcessContextFactory() override;
 
   // If true (the default) an OutputSurface is created that does not display
@@ -59,6 +60,7 @@ class InProcessContextFactory : public ContextFactory,
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
   cc::FrameSinkId AllocateFrameSinkId() override;
   cc::SurfaceManager* GetSurfaceManager() override;
+  display_compositor::DisplayCompositor* GetDisplayCompositor() override;
   void SetDisplayVisible(ui::Compositor* compositor, bool visible) override;
   void ResizeDisplay(ui::Compositor* compositor,
                      const gfx::Size& size) override;
@@ -87,7 +89,7 @@ class InProcessContextFactory : public ContextFactory,
   uint32_t next_surface_sink_id_;
   bool use_test_surface_;
   bool context_factory_for_test_;
-  cc::SurfaceManager* surface_manager_;
+  display_compositor::DisplayCompositor* display_compositor_;
   base::ObserverList<ContextFactoryObserver> observer_list_;
 
   using PerCompositorDataMap =