Revert of Mandoline UI Process: Update namespaces and file names

components/mus/display_manager.h

Index: components/mus/display_manager.h
diff --git a/components/mus/display_manager.h b/components/mus/display_manager.h
index 4173f367b0f1ba75aba182d11a00b89fa9450a83..3f2dc78296db0e172c420a6acc44fece2bb05f9f 100644
--- a/components/mus/display_manager.h
+++ b/components/mus/display_manager.h
@@ -31,18 +31,21 @@
 class ApplicationImpl;
 }  // namespace mojo
 
+namespace surfaces {
+class SurfacesScheduler;
+class SurfacesState;
+}  // namespace surfaces
+
 namespace ui {
 class PlatformWindow;
 struct TextInputState;
 }  // namespace ui
 
-namespace mus {
+namespace view_manager {
 
 class DisplayManagerFactory;
 class EventDispatcher;
 class ServerView;
-class SurfacesScheduler;
-class SurfacesState;
 
 // DisplayManager is used to connect the root ServerView to a display.
 class DisplayManager {
@@ -52,8 +55,8 @@
   static 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);
 
   virtual void Init(DisplayManagerDelegate* delegate) = 0;
 
@@ -86,10 +89,11 @@
 class DefaultDisplayManager : public DisplayManager,
                               public ui::PlatformWindowDelegate {
  public:
-  DefaultDisplayManager(bool is_headless,
-                        mojo::ApplicationImpl* app_impl,
-                        const scoped_refptr<GpuState>& gpu_state,
-                        const scoped_refptr<SurfacesState>& surfaces_state);
+  DefaultDisplayManager(
+      bool is_headless,
+      mojo::ApplicationImpl* app_impl,
+      const scoped_refptr<gles2::GpuState>& gpu_state,
+      const scoped_refptr<surfaces::SurfacesState>& surfaces_state);
   ~DefaultDisplayManager() override;
 
   // DisplayManager:
@@ -121,8 +125,8 @@
 
   bool is_headless_;
   mojo::ApplicationImpl* app_impl_;
-  scoped_refptr<GpuState> gpu_state_;
-  scoped_refptr<SurfacesState> surfaces_state_;
+  scoped_refptr<gles2::GpuState> gpu_state_;
+  scoped_refptr<surfaces::SurfacesState> surfaces_state_;
   DisplayManagerDelegate* delegate_;
 
   mojo::ViewportMetrics metrics_;
@@ -130,7 +134,7 @@
   base::Timer draw_timer_;
   bool frame_pending_;
 
-  scoped_ptr<TopLevelDisplayClient> top_level_display_client_;
+  scoped_ptr<surfaces::TopLevelDisplayClient> top_level_display_client_;
   scoped_ptr<ui::PlatformWindow> platform_window_;
 
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
@@ -138,6 +142,6 @@
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_DISPLAY_MANAGER_H_