Revert of Mandoline UI Process: Update namespaces and file names

components/web_view/frame_apptest.cc

Index: components/web_view/frame_apptest.cc
diff --git a/components/web_view/frame_apptest.cc b/components/web_view/frame_apptest.cc
index 99fb2e2a448562f2b22a9e2e27bc180cb41d2f8a..2526bd8c7c97689ec2c13a4b8eaece154d301118 100644
--- a/components/web_view/frame_apptest.cc
+++ b/components/web_view/frame_apptest.cc
@@ -26,8 +26,8 @@
 #include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/application/public/cpp/service_provider_impl.h"
 
-using mus::View;
-using mus::ViewTreeConnection;
+using mojo::View;
+using mojo::ViewTreeConnection;
 
 namespace web_view {
 
@@ -141,7 +141,7 @@
 // a single FrameTreeClient. In other words this maintains the data structures
 // needed to represent a client side frame. To obtain one use
 // FrameTest::WaitForViewAndFrame().
-class ViewAndFrame : public mus::ViewTreeDelegate {
+class ViewAndFrame : public mojo::ViewTreeDelegate {
  public:
   ~ViewAndFrame() override {
     if (view_)
@@ -149,7 +149,7 @@
   }
 
   // The View associated with the frame.
-  mus::View* view() { return view_; }
+  mojo::View* view() { return view_; }
   TestFrameTreeClient* test_frame_tree_client() {
     return &test_frame_tree_client_;
   }
@@ -189,7 +189,7 @@
     view_ = nullptr;
   }
 
-  mus::View* view_;
+  mojo::View* view_;
   base::RunLoop run_loop_;
   TestFrameTreeClient test_frame_tree_client_;
   mojo::Binding<FrameTreeClient> frame_tree_binding_;
@@ -199,7 +199,7 @@
 
 class FrameTest : public mojo::test::ApplicationTestBase,
                   public mojo::ApplicationDelegate,
-                  public mus::ViewTreeDelegate,
+                  public mojo::ViewTreeDelegate,
                   public mojo::InterfaceFactory<mojo::ViewTreeClient>,
                   public mojo::InterfaceFactory<FrameTreeClient> {
  public:
@@ -223,7 +223,7 @@
 
   // Creates a new shared frame as a child of |parent|.
   Frame* CreateSharedFrame(ViewAndFrame* parent) {
-    mus::View* child_frame_view = parent->view()->connection()->CreateView();
+    mojo::View* child_frame_view = parent->view()->connection()->CreateView();
     parent->view()->AddChild(child_frame_view);
     mojo::Map<mojo::String, mojo::Array<uint8_t>> client_properties;
     client_properties.mark_non_null();
@@ -281,7 +281,7 @@
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
-    mus::CreateSingleViewTreeHost(application_impl(), this, &host_);
+    mojo::CreateSingleViewTreeHost(application_impl(), this, &host_);
 
     ASSERT_TRUE(DoRunLoopWithTimeout());
     std::swap(window_manager_, most_recent_connection_);
@@ -294,7 +294,7 @@
     FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
     mojo::ViewTreeClientPtr view_tree_client =
         frame_connection->GetViewTreeClient();
-    mus::View* frame_root_view = window_manager()->CreateView();
+    mojo::View* frame_root_view = window_manager()->CreateView();
     window_manager()->GetRoot()->AddChild(frame_root_view);
     frame_tree_.reset(
         new FrameTree(0u, frame_root_view, view_tree_client.Pass(),
@@ -316,9 +316,9 @@
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<mojo::ViewTreeClient> request) override {
     if (view_and_frame_) {
-      mus::ViewTreeConnection::Create(view_and_frame_.get(), request.Pass());
+      mojo::ViewTreeConnection::Create(view_and_frame_.get(), request.Pass());
     } else {
-      mus::ViewTreeConnection::Create(this, request.Pass());
+      mojo::ViewTreeConnection::Create(this, request.Pass());
     }
   }