WIP: Towards merging OffscreenCanvas and Mus code

ui/aura/demo/demo_main.cc

Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 0df44ba9c28a03e8e0ce623b7ac286ff22f5b556..ba77ddf59cf9826356f692c49c2abb41ba282413 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -14,7 +14,7 @@
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
-#include "cc/surfaces/surface_manager.h"
+#include "components/display_compositor/display_compositor.h"
 #include "third_party/skia/include/core/SkBlendMode.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_parenting_client.h"
@@ -140,10 +140,11 @@ int DemoMain() {
 
   // The ContextFactory must exist before any Compositors are created.
   bool context_factory_for_test = false;
-  cc::SurfaceManager surface_manager;
+
+  display_compositor::DisplayCompositor display_compositor;
   std::unique_ptr<ui::InProcessContextFactory> context_factory(
       new ui::InProcessContextFactory(context_factory_for_test,
-                                      &surface_manager));
+                                      &display_compositor));
   context_factory->set_use_test_surface(false);
 
   // Create the message-loop here before creating the root window.