Revert of Mandoline UI Process: Update namespaces and file names

components/mus/display_manager.cc

Index: components/mus/display_manager.cc
diff --git a/components/mus/display_manager.cc b/components/mus/display_manager.cc
index dd8c7f4fe728b729ff5b60f3954b4d03e5528da0..af29f1f6d4128ec12289b1f3ce1d724520a5c6fa 100644
--- a/components/mus/display_manager.cc
+++ b/components/mus/display_manager.cc
@@ -44,7 +44,7 @@
 using mojo::Rect;
 using mojo::Size;
 
-namespace mus {
+namespace view_manager {
 namespace {
 
 void DrawViewTree(cc::RenderPass* pass,
@@ -99,8 +99,8 @@
 DisplayManager* DisplayManager::Create(
     bool is_headless,
     mojo::ApplicationImpl* app_impl,
-    const scoped_refptr<GpuState>& gpu_state,
-    const scoped_refptr<SurfacesState>& surfaces_state) {
+    const scoped_refptr<gles2::GpuState>& gpu_state,
+    const scoped_refptr<surfaces::SurfacesState>& surfaces_state) {
   if (factory_) {
     return factory_->CreateDisplayManager(is_headless, app_impl, gpu_state,
                                           surfaces_state);
@@ -112,8 +112,8 @@
 DefaultDisplayManager::DefaultDisplayManager(
     bool is_headless,
     mojo::ApplicationImpl* app_impl,
-    const scoped_refptr<GpuState>& gpu_state,
-    const scoped_refptr<SurfacesState>& surfaces_state)
+    const scoped_refptr<gles2::GpuState>& gpu_state,
+    const scoped_refptr<surfaces::SurfacesState>& surfaces_state)
     : is_headless_(is_headless),
       app_impl_(app_impl),
       gpu_state_(gpu_state),
@@ -341,12 +341,12 @@
     gfx::AcceleratedWidget widget,
     float device_pixel_ratio) {
   if (widget != gfx::kNullAcceleratedWidget) {
-    top_level_display_client_.reset(
-        new TopLevelDisplayClient(widget, gpu_state_, surfaces_state_));
+    top_level_display_client_.reset(new surfaces::TopLevelDisplayClient(
+        widget, gpu_state_, surfaces_state_));
   }
   UpdateMetrics(metrics_.size_in_pixels.To<gfx::Size>(), device_pixel_ratio);
 }
 
 void DefaultDisplayManager::OnActivationChanged(bool active) {}
 
-}  // namespace mus
+}  // namespace view_manager