WIP: Towards merging OffscreenCanvas and Mus code

ui/compositor/test/context_factories_for_test.cc

Index: ui/compositor/test/context_factories_for_test.cc
diff --git a/ui/compositor/test/context_factories_for_test.cc b/ui/compositor/test/context_factories_for_test.cc
index c7b2b27fe192ca9a1481409d2e3f29308b771a6a..835332ca27af866d6f2942ffaf069b5ef049c9e6 100644
--- a/ui/compositor/test/context_factories_for_test.cc
+++ b/ui/compositor/test/context_factories_for_test.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/sys_info.h"
 #include "cc/surfaces/surface_manager.h"
+#include "components/display_compositor/display_compositor.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/test/in_process_context_factory.h"
@@ -14,7 +15,7 @@
 
 namespace {
 
-static cc::SurfaceManager* g_surface_manager = nullptr;
+static display_compositor::DisplayCompositor* g_display_compositor = nullptr;
 static ui::InProcessContextFactory* g_implicit_factory = NULL;
 static gl::DisableNullDrawGLBindings* g_disable_null_draw = NULL;
 
@@ -35,9 +36,9 @@ void InitializeContextFactoryForTests(
   if (enable_pixel_output)
     g_disable_null_draw = new gl::DisableNullDrawGLBindings;
   bool context_factory_for_test = true;
-  g_surface_manager = new cc::SurfaceManager;
-  g_implicit_factory =
-      new InProcessContextFactory(context_factory_for_test, g_surface_manager);
+  g_display_compositor = new display_compositor::DisplayCompositor();
+  g_implicit_factory = new InProcessContextFactory(context_factory_for_test,
+                                                   g_display_compositor);
   *context_factory = g_implicit_factory;
   *context_factory_private = g_implicit_factory;
 }
@@ -48,8 +49,8 @@ void TerminateContextFactoryForTests() {
     delete g_implicit_factory;
     g_implicit_factory = NULL;
   }
-  delete g_surface_manager;
-  g_surface_manager = nullptr;
+  delete g_display_compositor;
+  g_display_compositor = nullptr;
   delete g_disable_null_draw;
   g_disable_null_draw = NULL;
 }