Migrating tests to use EmbeddedTestServer (misc)

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/time/time.h"
 #include "base/values.h"
 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h"
 #include "components/mus/public/cpp/tests/window_server_test_base.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_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.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 "net/test/embedded_test_server/embedded_test_server.h"
 #include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h"
 
 using mus::mojom::WindowTreeClientPtr;
 using mus::WindowServerTestBase;
 using web_view::Frame;
 using web_view::FrameConnection;
 using web_view::FrameTree;
 using web_view::FrameTreeDelegate;
 using web_view::mojom::FrameClient;
 
 namespace mojo {
 
 namespace {
 
 const char kAddFrameWithEmptyPageScript[] =
     "var iframe = document.createElement(\"iframe\");"
-    "iframe.src = \"http://127.0.0.1:%u/files/empty_page.html\";"
+    "iframe.src = \"http://127.0.0.1:%u/empty_page.html\";"
     "document.body.appendChild(iframe);";
 
 void OnGotContentHandlerForRoot(bool* got_callback) {
   *got_callback = true;
   ignore_result(WindowServerTestBase::QuitRunLoop());
 }
 
 mojo::ApplicationConnection* ApplicationConnectionForFrame(Frame* frame) {
   return static_cast<FrameConnection*>(frame->user_data())
       ->application_connection();
@@ skipping 113 matching lines @@
   ~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::Window* embed_window = window_manager()->NewWindow();
     frame_tree_delegate_.reset(
         new TestFrameTreeDelegateImpl(application_impl()));
     FrameConnection* root_connection = InitFrameTree(
-        embed_window, "http://127.0.0.1:%u/files/empty_page2.html");
+        embed_window, "http://127.0.0.1:%u/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());
     if (frame_text != "child2") {
       ADD_FAILURE() << "unexpected text " << frame_text;
       return nullptr;
     }
@@ skipping 47 matching lines @@
         Frame::ClientPropertyMap(), base::TimeTicks::Now()));
     frame_tree_delegate_->set_frame_tree(frame_tree_.get());
     return result;
   }
 
   // ViewManagerTest:
   void SetUp() override {
     WindowServerTestBase::SetUp();
 
     // Start a test server.
-    http_server_.reset(new net::SpawnedTestServer(
-        net::SpawnedTestServer::TYPE_HTTP, net::SpawnedTestServer::kLocalhost,
-        base::FilePath(FILE_PATH_LITERAL("components/test/data/html_viewer"))));
+    http_server_.reset(new net::EmbeddedTestServer);
+    http_server_->ServeFilesFromSourceDirectory(
+        "components/test/data/html_viewer");
     ASSERT_TRUE(http_server_->Start());
   }
   void TearDown() override {
     frame_tree_.reset();
     http_server_.reset();
     WindowServerTestBase::TearDown();
   }
 
-  scoped_ptr<net::SpawnedTestServer> http_server_;
+  scoped_ptr<net::EmbeddedTestServer> http_server_;
   scoped_ptr<FrameTree> frame_tree_;
 
   scoped_ptr<TestFrameTreeDelegateImpl> frame_tree_delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HTMLFrameTest);
 };
 
 TEST_F(HTMLFrameTest, PageWithSingleFrame) {
   mus::Window* embed_window = window_manager()->NewWindow();
 
   FrameConnection* root_connection = InitFrameTree(
-      embed_window, "http://127.0.0.1:%u/files/page_with_single_frame.html");
+      embed_window, "http://127.0.0.1:%u/page_with_single_frame.html");
   ASSERT_TRUE(root_connection);
 
   ASSERT_EQ("Page with single frame",
             GetFrameText(root_connection->application_connection()));
 
   ASSERT_NO_FATAL_FAILURE(
       frame_tree_delegate_->WaitForChildFrameCount(frame_tree_->root(), 1u));
 
   ASSERT_EQ(1u, embed_window->children().size());
   Frame* child_frame =
       frame_tree_->root()->FindFrame(embed_window->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::Window* embed_window = window_manager()->NewWindow();
 
   ASSERT_TRUE(InitFrameTree(
-      embed_window, "http://127.0.0.1:%u/files/page_with_single_frame.html"));
+      embed_window, "http://127.0.0.1:%u/page_with_single_frame.html"));
 
   // page_with_single_frame contains a child frame. The child frame should
   // create a new View and Frame.
   ASSERT_NO_FATAL_FAILURE(
       frame_tree_delegate_->WaitForChildFrameCount(frame_tree_->root(), 1u));
 
   Frame* child_frame = frame_tree_->root()->children().back();
 
   ASSERT_EQ("child",
             GetFrameText(static_cast<FrameConnection*>(child_frame->user_data())
                              ->application_connection()));
 
   // Change the location and wait for the navigation to occur.
   const char kNavigateFrame[] =
       "window.frames[0].location = "
-      "'http://127.0.0.1:%u/files/empty_page2.html'";
+      "'http://127.0.0.1:%u/empty_page2.html'";
   frame_tree_delegate_->ClearGotNavigate(child_frame);
   ExecuteScript(ApplicationConnectionForFrame(frame_tree_->root()),
                 AddPortToString(kNavigateFrame));
   ASSERT_TRUE(frame_tree_delegate_->WaitForFrameNavigation(child_frame));
 
   // There should still only be one frame.
   ASSERT_EQ(1u, frame_tree_->root()->children().size());
 
   // The navigation should have changed the text of the frame.
   ASSERT_TRUE(child_frame->user_data());
@@ skipping 153 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