Migrating tests to use EmbeddedTestServer (misc)

components/html_viewer/ax_provider_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/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.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/public/interfaces/frame.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h"
 
 namespace mojo {
 
 namespace {
 
 // Returns true if the tree contains a text node with contents matching |text|.
 bool AxTreeContainsText(const Array<AxNodePtr>& tree, const String& text) {
   for (size_t i = 0; i < tree.size(); ++i) {
@@ skipping 37 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(TestFrame);
 };
 
 }  // namespace
 
 using AXProviderTest = mus::WindowServerTestBase;
 
 TEST_F(AXProviderTest, HelloWorld) {
   // Start a test server for net/data/test.html access.
-  net::SpawnedTestServer server(
-      net::SpawnedTestServer::TYPE_HTTP, net::SpawnedTestServer::kLocalhost,
-      base::FilePath(FILE_PATH_LITERAL("net/data")));
+  net::EmbeddedTestServer server;
+  server.ServeFilesFromSourceDirectory("net/data");
   ASSERT_TRUE(server.Start());
 
   // Connect to the URL through the mojo:html_viewer content handler.
   const uint16_t assigned_port = server.host_port_pair().port();
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(
-      base::StringPrintf("http://127.0.0.1:%u/files/test.html", assigned_port));
+      base::StringPrintf("http://127.0.0.1:%u/test.html", assigned_port));
   scoped_ptr<ApplicationConnection> connection =
       application_impl()->ConnectToApplication(request.Pass());
 
   // Embed the html_viewer in a Window.
   mus::mojom::WindowTreeClientPtr tree_client;
   connection->ConnectToService(&tree_client);
   mus::Window* embed_window = window_manager()->NewWindow();
   embed_window->Embed(tree_client.Pass());
 
   TestFrame frame;
@@ skipping 22 matching lines @@
                          EXPECT_TRUE(QuitRunLoop());
                        });
   ASSERT_TRUE(DoRunLoopWithTimeout());
 
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "Hello "));
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "World!"));
   EXPECT_FALSE(AxTreeContainsText(ax_tree, "foo"));
 }
 
 }  // namespace mojo