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, 8 insertions, 5 deletions

diff --git a/components/mus/server_view_delegate.h b/components/mus/server_view_delegate.h
index abe0aaa..8f846a8 100644
--- a/components/mus/server_view_delegate.h
+++ b/components/mus/server_view_delegate.h
@@ -7,23 +7,26 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
-#include "components/mus/public/interfaces/mus_constants.mojom.h"
+#include "components/mus/public/interfaces/view_manager_constants.mojom.h"
 
 namespace cc {
 class CompositorFrame;
 }
 
-namespace mus {
+namespace surfaces {
+class SurfacesState;
+}
+
+namespace view_manager {
 
 class ServerView;
-class SurfacesState;
 
 class ServerViewDelegate {
  public:
   virtual scoped_ptr<cc::CompositorFrame> UpdateViewTreeFromCompositorFrame(
       const mojo::CompositorFramePtr& input) = 0;
 
-  virtual SurfacesState* GetSurfacesState() = 0;
+  virtual surfaces::SurfacesState* GetSurfacesState() = 0;
 
   virtual void OnScheduleViewPaint(const ServerView* view) = 0;
 
@@ -35,6 +38,6 @@ class ServerViewDelegate {
   virtual ~ServerViewDelegate() {}
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_SERVER_VIEW_DELEGATE_H_