Revert of Mandoline UI Process: Update namespaces and file names

components/web_view/web_view_apptest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/web_view/public/cpp/web_view.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 
 namespace {
 const char kTestOneFile[] = "test_one.html";
 const char kTestOneTitle[] = "Test Title One";
 const char kTestTwoFile[] = "test_two.html";
 const char kTestTwoTitle[] = "Test Title Two";
 const char kTestThreeFile[] = "test_three.html";
 const char kTestThreeTitle[] = "Test Title Three";
 }
 
-class WebViewTest : public mus::ViewManagerTestBase,
+class WebViewTest : public mojo::ViewManagerTestBase,
                     public mojom::WebViewClient {
  public:
   WebViewTest() : web_view_(this) {}
   ~WebViewTest() override {}
 
   mojom::WebView* web_view() { return web_view_.web_view(); }
 
   const std::string& last_title() { return last_title_; }
   mojom::ButtonState last_back_button_state() {
     return last_back_button_state_;
@@ skipping 26 matching lines @@
     }
   }
 
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     ViewManagerTestBase::Initialize(app);
     app_ = app;
   }
 
   // Overridden from ViewTreeDelegate:
-  void OnEmbed(mus::View* root) override {
+  void OnEmbed(mojo::View* root) override {
     content_ = root->connection()->CreateView();
     root->AddChild(content_);
     content_->SetVisible(true);
 
     web_view_.Init(app_, content_);
 
     ViewManagerTestBase::OnEmbed(root);
   }
 
   void TearDown() override {
-    mus::ScopedViewPtr::DeleteViewOrViewManager(window_manager()->GetRoot());
+    mojo::ScopedViewPtr::DeleteViewOrViewManager(window_manager()->GetRoot());
     ViewManagerTestBase::TearDown();
   }
 
   // Overridden from web_view::mojom::WebViewClient:
   void TopLevelNavigate(mojo::URLRequestPtr request) override {}
   void LoadingStateChanged(bool is_loading) override {
     if (is_loading == false)
       QuitNestedRunLoop();
   }
   void ProgressChanged(double progress) override {}
   void BackForwardChanged(mojom::ButtonState back_button,
                           mojom::ButtonState forward_button) override {
     last_back_button_state_ = back_button;
     last_forward_button_state_ = forward_button;
   }
   void TitleChanged(const mojo::String& title) override {
     last_title_ = title.get();
   }
 
   mojo::ApplicationImpl* app_;
 
-  mus::View* content_;
+  mojo::View* content_;
 
   web_view::WebView web_view_;
 
   scoped_ptr<base::RunLoop> run_loop_;
 
   std::string last_title_;
   mojom::ButtonState last_back_button_state_;
   mojom::ButtonState last_forward_button_state_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewTest);
@@ skipping 59 matching lines @@
   // Now navigate to a third file. This should clear the forward stack.
   ASSERT_NO_FATAL_FAILURE(NavigateTo(kTestThreeFile));
 
   EXPECT_EQ(kTestThreeTitle, last_title());
   EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_ENABLED, last_back_button_state());
   EXPECT_EQ(mojom::ButtonState::BUTTON_STATE_DISABLED,
             last_forward_button_state());
 }
 
 }  // namespace web_view