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}

2 files changed, 22 insertions, 21 deletions

diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
index db21dde..93307aa 100644
--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
@@ -47,7 +47,7 @@ void PhoneBrowserApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
       break;
     }
   }
-  mus::CreateSingleViewTreeHost(app_, this, &host_);
+  mojo::CreateSingleViewTreeHost(app_, this, &host_);
 }
 
 bool PhoneBrowserApplicationDelegate::ConfigureIncomingConnection(
@@ -66,9 +66,9 @@ void PhoneBrowserApplicationDelegate::LaunchURL(const mojo::String& url) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PhoneBrowserApplicationDelegate, mus::ViewTreeDelegate implementation:
+// PhoneBrowserApplicationDelegate, mojo::ViewTreeDelegate implementation:
 
-void PhoneBrowserApplicationDelegate::OnEmbed(mus::View* root) {
+void PhoneBrowserApplicationDelegate::OnEmbed(mojo::View* root) {
   CHECK(!root_);
   root_ = root;
   content_ = root->connection()->CreateView();
@@ -83,13 +83,14 @@ void PhoneBrowserApplicationDelegate::OnEmbed(mus::View* root) {
 }
 
 void PhoneBrowserApplicationDelegate::OnConnectionLost(
-    mus::ViewTreeConnection* connection) {}
+    mojo::ViewTreeConnection* connection) {
+}
 
 ////////////////////////////////////////////////////////////////////////////////
-// PhoneBrowserApplicationDelegate, mus::ViewObserver implementation:
+// PhoneBrowserApplicationDelegate, mojo::ViewObserver implementation:
 
 void PhoneBrowserApplicationDelegate::OnViewBoundsChanged(
-    mus::View* view,
+    mojo::View* view,
     const mojo::Rect& old_bounds,
     const mojo::Rect& new_bounds) {
   CHECK_EQ(view, root_);
diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.h b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
index 0193eed..bb41044 100644
--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.h
+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
@@ -18,19 +18,19 @@
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
 
-namespace mus {
+namespace mojo {
 class View;
 }
 
 namespace mandoline {
 
-class PhoneBrowserApplicationDelegate
-    : public mojo::ApplicationDelegate,
-      public LaunchHandler,
-      public mus::ViewTreeDelegate,
-      public mus::ViewObserver,
-      public web_view::mojom::WebViewClient,
-      public mojo::InterfaceFactory<LaunchHandler> {
+class PhoneBrowserApplicationDelegate :
+    public mojo::ApplicationDelegate,
+    public LaunchHandler,
+    public mojo::ViewTreeDelegate,
+    public mojo::ViewObserver,
+    public web_view::mojom::WebViewClient,
+    public mojo::InterfaceFactory<LaunchHandler> {
  public:
   PhoneBrowserApplicationDelegate();
   ~PhoneBrowserApplicationDelegate() override;
@@ -44,12 +44,12 @@ class PhoneBrowserApplicationDelegate
   // Overridden from LaunchHandler:
   void LaunchURL(const mojo::String& url) override;
 
-  // Overridden from mus::ViewTreeDelegate:
-  void OnEmbed(mus::View* root) override;
-  void OnConnectionLost(mus::ViewTreeConnection* connection) override;
+  // Overridden from mojo::ViewTreeDelegate:
+  void OnEmbed(mojo::View* root) override;
+  void OnConnectionLost(mojo::ViewTreeConnection* connection) override;
 
-  // Overridden from mus::ViewObserver:
-  void OnViewBoundsChanged(mus::View* view,
+  // Overridden from mojo::ViewObserver:
+  void OnViewBoundsChanged(mojo::View* view,
                            const mojo::Rect& old_bounds,
                            const mojo::Rect& new_bounds) override;
 
@@ -68,8 +68,8 @@ class PhoneBrowserApplicationDelegate
   mojo::ApplicationImpl* app_;
   mojo::ViewTreeHostPtr host_;
 
-  mus::View* root_;
-  mus::View* content_;
+  mojo::View* root_;
+  mojo::View* content_;
   web_view::WebView web_view_;
 
   mojo::String default_url_;