Migrating tests to use EmbeddedTestServer (misc)

chrome/test/nacl/nacl_browsertest_util.cc

 // Copyright (c) 2012 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 "chrome/test/nacl/nacl_browsertest_util.h"
 
 #include <stdlib.h>
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/webplugininfo.h"
 #include "net/base/net_util.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"

[mmenke, 2015/11/05 17:38:13]

This is included in the header, so not needed (Could forward declare in the
header, alternatively, but then I suspect you'd break other files that aren't
IWYU-clean).

[svaldez, 2015/11/05 18:15:55]

Done.

 
 typedef content::TestMessageHandler::MessageResponse MessageResponse;
 
 MessageResponse StructuredMessageHandler::HandleMessage(
     const std::string& json) {
   base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS);
   // Automation messages are stringified before they are sent because the
   // automation channel cannot handle arbitrary objects.  This means we
   // need to decode the json twice to get the original message.
   scoped_ptr<base::Value> value = reader.ReadToValue(json);
@@ skipping 171 matching lines @@
 bool NaClBrowserTestBase::GetDocumentRoot(base::FilePath* document_root) {
   return GetNaClVariantRoot(Variant(), document_root);
 }
 
 bool NaClBrowserTestBase::IsAPnaclTest() {
   return false;
 }
 
 GURL NaClBrowserTestBase::TestURL(
     const base::FilePath::StringType& url_fragment) {
-  base::FilePath expanded_url = base::FilePath(FILE_PATH_LITERAL("files"));
+  base::FilePath expanded_url = base::FilePath(FILE_PATH_LITERAL("/"));
   expanded_url = expanded_url.Append(url_fragment);
   return test_server_->GetURL(expanded_url.MaybeAsASCII());
 }
 
 bool NaClBrowserTestBase::RunJavascriptTest(
     const GURL& url,
     content::TestMessageHandler* handler) {
   content::JavascriptTestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents(),
       handler);
@@ skipping 28 matching lines @@
                               &handler);
   ASSERT_TRUE(ok) << handler.error_message();
   ASSERT_TRUE(handler.test_passed()) << "Test failed.";
 }
 
 bool NaClBrowserTestBase::StartTestServer() {
   // Launch the web server.
   base::FilePath document_root;
   if (!GetDocumentRoot(&document_root))
     return false;
-  test_server_.reset(new net::SpawnedTestServer(
-                         net::SpawnedTestServer::TYPE_HTTP,
-                         net::SpawnedTestServer::kLocalhost,
-                         document_root));
+  test_server_.reset(new net::EmbeddedTestServer);
+  test_server_->ServeFilesFromSourceDirectory(document_root);
   return test_server_->Start();
 }
 
 base::FilePath::StringType NaClBrowserTestNewlib::Variant() {
   return FILE_PATH_LITERAL("newlib");
 }
 
 base::FilePath::StringType NaClBrowserTestGLibc::Variant() {
   return FILE_PATH_LITERAL("glibc");
 }
@@ skipping 69 matching lines @@
   // to point at the isolated the test extension directory.
   // Otherwise, multiple NaCl extensions tests will end up sharing the
   // same directory when loading the extension files.
   base::FilePath document_root;
   ASSERT_TRUE(GetDocumentRoot(&document_root));
 
   // Document root is relative to source root, and source root may not be CWD.
   command_line->AppendSwitchPath(switches::kLoadExtension,
                                  src_root.Append(document_root));
 }