Revert of Mandoline UI Process: Update namespaces and file names (patchset #9 id:150001 of https://codereview.chromium.org/1340983002/ )

Reason for revert:
Speculative, might've broken mojo_apptests on http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32066

Original issue's description:
> Mandoline UI Process: Update namespaces and file names
>
> This CL updates namespaces in components/mus to mus from mojo, surfaces, gles2, and view_manager.
>
> BUG=531533
> TBR=jam@chromium.org for trivial pdf_viewer change.
>
> Committed: https://crrev.com/49b0d73f3ebb4801fc518751145504af3a2f70ed
> Cr-Commit-Position: refs/heads/master@{#349229}

TBR=sky@chromium.org,fsamuel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=531533

Review URL: https://codereview.chromium.org/1351013002

Cr-Commit-Position: refs/heads/master@{#349332}

1 files changed, 6 insertions, 6 deletions

diff --git a/components/mus/display_manager_factory.h b/components/mus/display_manager_factory.h
index e59424f..58b0ee0 100644
--- a/components/mus/display_manager_factory.h
+++ b/components/mus/display_manager_factory.h
@@ -8,11 +8,11 @@
 #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;
 
@@ -23,10 +23,10 @@ class DisplayManagerFactory {
   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_