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, 10 insertions, 9 deletions

diff --git a/components/mus/view_tree_host_impl.h b/components/mus/view_tree_host_impl.h
index 3aaeb80..2ce45c8 100644
--- a/components/mus/view_tree_host_impl.h
+++ b/components/mus/view_tree_host_impl.h
@@ -17,11 +17,11 @@ namespace cc {
 class SurfaceManager;
 }
 
-namespace mus {
+namespace surfaces {
 class SurfacesScheduler;
 }
 
-namespace mus {
+namespace view_manager {
 
 class ConnectionManager;
 class FocusController;
@@ -40,12 +40,13 @@ class ViewTreeHostImpl : public DisplayManagerDelegate,
   // TODO(fsamuel): All these parameters are just plumbing for creating
   // DisplayManagers. We should probably just store these common parameters
   // in the DisplayManagerFactory and pass them along on DisplayManager::Create.
-  ViewTreeHostImpl(mojo::ViewTreeHostClientPtr client,
-                   ConnectionManager* connection_manager,
-                   bool is_headless,
-                   mojo::ApplicationImpl* app_impl,
-                   const scoped_refptr<GpuState>& gpu_state,
-                   const scoped_refptr<SurfacesState>& surfaces_state);
+  ViewTreeHostImpl(
+      mojo::ViewTreeHostClientPtr client,
+      ConnectionManager* connection_manager,
+      bool is_headless,
+      mojo::ApplicationImpl* app_impl,
+      const scoped_refptr<gles2::GpuState>& gpu_state,
+      const scoped_refptr<surfaces::SurfacesState>& surfaces_state);
   ~ViewTreeHostImpl() override;
 
   // Initializes state that depends on the existence of a ViewTreeHostImpl.
@@ -117,6 +118,6 @@ class ViewTreeHostImpl : public DisplayManagerDelegate,
   DISALLOW_COPY_AND_ASSIGN(ViewTreeHostImpl);
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_VIEW_TREE_HOST_IMPL_H_