Revert of Mandoline UI Process: Update namespaces and file names

components/mus/display_manager_factory.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_MUS_DISPLAY_MANAGER_FACTORY_H_
 #define COMPONENTS_MUS_DISPLAY_MANAGER_FACTORY_H_
 
 #include "components/mus/gles2/gpu_state.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
 
-namespace mus {
+namespace mojo {
 class ApplicationImpl;
-}  // namespace mus
+}  // namespace mojo
 
-namespace mus {
+namespace view_manager {
 
 class DisplayManager;
 
 // Abstract factory for DisplayManagers. Used by tests to construct test
 // DisplayManagers.
 class DisplayManagerFactory {
  public:
   virtual DisplayManager* CreateDisplayManager(
       bool is_headless,
       mojo::ApplicationImpl* app_impl,
-      const scoped_refptr<GpuState>& gpu_state,
-      const scoped_refptr<SurfacesState>& surfaces_state) = 0;
+      const scoped_refptr<gles2::GpuState>& gpu_state,
+      const scoped_refptr<surfaces::SurfacesState>& surfaces_state) = 0;
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_DISPLAY_MANAGER_FACTORY_H_