Revert of Mandoline UI Process: Update namespaces and file names

components/html_viewer/html_frame_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 "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/values.h"
 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h"
 #include "components/mus/public/cpp/tests/view_manager_test_base.h"
 #include "components/mus/public/cpp/view.h"
 #include "components/mus/public/cpp/view_tree_connection.h"
 #include "components/web_view/frame.h"
 #include "components/web_view/frame_connection.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/public/interfaces/frame_tree.mojom.h"
 #include "components/web_view/test_frame_tree_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h"
 
-using mus::ViewManagerTestBase;
 using web_view::Frame;
 using web_view::FrameConnection;
 using web_view::FrameTree;
 using web_view::FrameTreeClient;
 using web_view::FrameTreeDelegate;
 
 namespace mojo {
 
 namespace {
 
@@ skipping 97 matching lines @@
 
 class HTMLFrameTest : public ViewManagerTestBase {
  public:
   HTMLFrameTest() {}
   ~HTMLFrameTest() override {}
 
  protected:
   // Creates the frame tree showing an empty page at the root and adds (via
   // script) a frame showing the same empty page.
   Frame* LoadEmptyPageAndCreateFrame() {
-    mus::View* embed_view = window_manager()->CreateView();
+    View* embed_view = window_manager()->CreateView();
     frame_tree_delegate_.reset(
         new TestFrameTreeDelegateImpl(application_impl()));
     FrameConnection* root_connection =
         InitFrameTree(embed_view, "http://127.0.0.1:%u/files/empty_page2.html");
     if (!root_connection) {
       ADD_FAILURE() << "unable to establish root connection";
       return nullptr;
     }
     const std::string frame_text =
         GetFrameText(root_connection->application_connection());
@@ skipping 32 matching lines @@
     const uint16_t assigned_port = http_server_->host_port_pair().port();
     return base::StringPrintf(string.c_str(), assigned_port);
   }
 
   mojo::URLRequestPtr BuildRequestForURL(const std::string& url_string) {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From(AddPortToString(url_string));
     return request.Pass();
   }
 
-  FrameConnection* InitFrameTree(mus::View* view,
-                                 const std::string& url_string) {
+  FrameConnection* InitFrameTree(View* view, const std::string& url_string) {
     frame_tree_delegate_.reset(
         new TestFrameTreeDelegateImpl(application_impl()));
     scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
     bool got_callback = false;
     frame_connection->Init(
         application_impl(), BuildRequestForURL(url_string),
         base::Bind(&OnGotContentHandlerForRoot, &got_callback));
     ignore_result(ViewManagerTestBase::DoRunLoopWithTimeout());
     if (!got_callback)
       return nullptr;
@@ skipping 35 matching lines @@
   scoped_ptr<net::SpawnedTestServer> http_server_;
   scoped_ptr<FrameTree> frame_tree_;
 
   scoped_ptr<TestFrameTreeDelegateImpl> frame_tree_delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HTMLFrameTest);
 };
 
 TEST_F(HTMLFrameTest, PageWithSingleFrame) {
-  mus::View* embed_view = window_manager()->CreateView();
+  View* embed_view = window_manager()->CreateView();
 
   FrameConnection* root_connection = InitFrameTree(
       embed_view, "http://127.0.0.1:%u/files/page_with_single_frame.html");
   ASSERT_TRUE(root_connection);
 
   ASSERT_EQ("Page with single frame",
             GetFrameText(root_connection->application_connection()));
 
   // page_with_single_frame contains a child frame. The child frame should
   // create a new View and Frame.
   if (frame_tree_->root()->children().empty() ||
       !frame_tree_->root()->children().back()->user_data()) {
     ASSERT_TRUE(WaitForNavigateFrame());
   }
 
   ASSERT_EQ(1u, embed_view->children().size());
   Frame* child_frame =
       frame_tree_->root()->FindFrame(embed_view->children()[0]->id());
   ASSERT_TRUE(child_frame);
 
   ASSERT_EQ("child",
             GetFrameText(static_cast<FrameConnection*>(child_frame->user_data())
                              ->application_connection()));
 }
 
 // Creates two frames. The parent navigates the child frame by way of changing
 // the location of the child frame.
 TEST_F(HTMLFrameTest, ChangeLocationOfChildFrame) {
-  mus::View* embed_view = window_manager()->CreateView();
+  View* embed_view = window_manager()->CreateView();
 
   ASSERT_TRUE(InitFrameTree(
       embed_view, "http://127.0.0.1:%u/files/page_with_single_frame.html"));
 
   // page_with_single_frame contains a child frame. The child frame should
   // create a new View and Frame.
   if (frame_tree_->root()->children().empty() ||
       !frame_tree_->root()->children().back()->user_data()) {
     ASSERT_TRUE(WaitForNavigateFrame());
   }
@@ skipping 175 matching lines @@
         script_value_as_list->GetString(0u, &message_in_child);
       }
     }
   } while (message_in_child != "hello from parent" &&
            base::TimeTicks::Now() - start_time <
                TestTimeouts::action_timeout());
   EXPECT_EQ("hello from parent", message_in_child);
 }
 
 }  // namespace mojo