Revert of Mandoline UI Process: Update namespaces and file names

components/mus/test_server_view_delegate.h

Index: components/mus/test_server_view_delegate.h
diff --git a/components/mus/test_server_view_delegate.h b/components/mus/test_server_view_delegate.h
index 7509326a87c883b1afc3a547e7790e324f621efe..8dbb5027a6661f13fa0162e2eb5f01c647688258 100644
--- a/components/mus/test_server_view_delegate.h
+++ b/components/mus/test_server_view_delegate.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "components/mus/server_view_delegate.h"
 
-namespace mus {
+namespace view_manager {
 
 class TestServerViewDelegate : public ServerViewDelegate {
  public:
@@ -21,7 +21,7 @@
   // ServerViewDelegate:
   scoped_ptr<cc::CompositorFrame> UpdateViewTreeFromCompositorFrame(
       const mojo::CompositorFramePtr& input) override;
-  SurfacesState* GetSurfacesState() override;
+  surfaces::SurfacesState* GetSurfacesState() override;
   void OnScheduleViewPaint(const ServerView* view) override;
   const ServerView* GetRootView(const ServerView* view) const override;
 
@@ -30,6 +30,6 @@
   DISALLOW_COPY_AND_ASSIGN(TestServerViewDelegate);
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_TEST_SERVER_VIEW_DELEGATE_H_