WIP: Towards merging OffscreenCanvas and Mus code

ui/views/examples/examples_main.cc

 // Copyright 2012 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 <memory>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "base/run_loop.h"
 #include "base/test/test_discardable_memory_allocator.h"
 #include "build/build_config.h"
-#include "cc/surfaces/surface_manager.h"
+#include "components/display_compositor/display_compositor.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/test/in_process_context_factory.h"
 #include "ui/display/screen.h"
 #include "ui/gl/init/gl_factory.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/examples/examples_window.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
@@ skipping 31 matching lines @@
 #if defined(USE_X11)
   // This demo uses InProcessContextFactory which uses X on a separate Gpu
   // thread.
   gfx::InitializeThreadedX11();
 #endif
 
   gl::init::InitializeGLOneOff();
 
   // 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);
 
   base::MessageLoopForUI message_loop;
 
   base::i18n::InitializeICU();
 
   ui::RegisterPathProvider();
 
   base::FilePath ui_test_pak_path;
   CHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
@@ skipping 36 matching lines @@
   }
 
   ui::ShutdownInputMethod();
 
 #if defined(USE_AURA)
   env.reset();
 #endif
 
   return 0;
 }