Migrating tests to use EmbeddedTestServer (misc)

chrome/test/ppapi/ppapi_test.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/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/path_service.h"
@@ skipping 15 matching lines @@
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/ppapi_test_utils.h"
 #include "media/base/media_switches.h"
 #include "net/base/filename_util.h"
 #include "net/base/test_data_directory.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"

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

This is already included in the header for this file.

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

Done.

+#include "net/test/spawned_test_server/spawned_test_server.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "ui/gl/gl_switches.h"
 
 using content::RenderViewHost;
 using content::TestMessageHandler;
 
 namespace {
 
 void AddPrivateSwitches(base::CommandLine* command_line) {
   // For TestRequestOSFileHandle.
@@ skipping 122 matching lines @@
 }
 
 void PPAPITestBase::RunTest(const std::string& test_case) {
   GURL url = GetTestFileUrl(test_case);
   RunTestURL(url);
 }
 
 void PPAPITestBase::RunTestViaHTTP(const std::string& test_case) {
   base::FilePath document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
-  net::SpawnedTestServer http_server(net::SpawnedTestServer::TYPE_HTTP,
-                                     net::SpawnedTestServer::kLocalhost,
-                                     document_root);
+  net::EmbeddedTestServer http_server;
+  http_server.AddDefaultHandlers(document_root);
   ASSERT_TRUE(http_server.Start());
   RunTestURL(GetTestURL(http_server, test_case, std::string()));
 }
 
 void PPAPITestBase::RunTestWithSSLServer(const std::string& test_case) {
   base::FilePath http_document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
-  net::SpawnedTestServer http_server(net::SpawnedTestServer::TYPE_HTTP,
-                                     net::SpawnedTestServer::kLocalhost,
-                                     http_document_root);
-  net::SpawnedTestServer ssl_server(net::SpawnedTestServer::TYPE_HTTPS,
-                                    net::BaseTestServer::SSLOptions(),
-                                    http_document_root);
+  net::EmbeddedTestServer http_server;
+  http_server.AddDefaultHandlers(http_document_root);
+  net::EmbeddedTestServer ssl_server(net::EmbeddedTestServer::TYPE_HTTPS);
+  ssl_server.AddDefaultHandlers(http_document_root);
   // Start the servers in parallel.

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

Comment outdated.

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

Done.

-  ASSERT_TRUE(http_server.StartInBackground());
-  ASSERT_TRUE(ssl_server.StartInBackground());
-  // Wait until they are both finished before continuing.
-  ASSERT_TRUE(http_server.BlockUntilStarted());
-  ASSERT_TRUE(ssl_server.BlockUntilStarted());
+  ASSERT_TRUE(http_server.Start());
+  ASSERT_TRUE(ssl_server.Start());
 
   uint16_t port = ssl_server.host_port_pair().port();
   RunTestURL(GetTestURL(http_server,
                         test_case,
                         base::StringPrintf("ssl_server_port=%d", port)));
 }
 
 void PPAPITestBase::RunTestWithWebSocketServer(const std::string& test_case) {
   base::FilePath http_document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
-  net::SpawnedTestServer http_server(net::SpawnedTestServer::TYPE_HTTP,
-                                     net::SpawnedTestServer::kLocalhost,
-                                     http_document_root);
+  net::EmbeddedTestServer http_server;
+  http_server.AddDefaultHandlers(http_document_root);
   net::SpawnedTestServer ws_server(net::SpawnedTestServer::TYPE_WS,
                                    net::SpawnedTestServer::kLocalhost,
                                    net::GetWebSocketTestDataDirectory());
   // Start the servers in parallel.

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

Remove comment.

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

Done.

-  ASSERT_TRUE(http_server.StartInBackground());
+  ASSERT_TRUE(http_server.Start());
   ASSERT_TRUE(ws_server.StartInBackground());

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

I don't think we get anything out of using calls here any more?

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

Done.

   // Wait until they are both finished before continuing.
-  ASSERT_TRUE(http_server.BlockUntilStarted());
   ASSERT_TRUE(ws_server.BlockUntilStarted());
 
   std::string host = ws_server.host_port_pair().HostForURL();
   uint16_t port = ws_server.host_port_pair().port();
   RunTestURL(GetTestURL(http_server,
                         test_case,
                         base::StringPrintf(
                             "websocket_host=%s&websocket_port=%d",
                             host.c_str(),
                             port)));
@@ skipping 28 matching lines @@
   content::JavascriptTestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents(),
       &handler);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   ASSERT_TRUE(observer.Run()) << handler.error_message();
   EXPECT_STREQ("PASS", handler.message().c_str());
 }
 
-GURL PPAPITestBase::GetTestURL(
-    const net::SpawnedTestServer& http_server,
-    const std::string& test_case,
-    const std::string& extra_params) {
-  std::string query = BuildQuery("files/test_case.html?", test_case);
+GURL PPAPITestBase::GetTestURL(const net::EmbeddedTestServer& http_server,
+                               const std::string& test_case,
+                               const std::string& extra_params) {
+  std::string query = BuildQuery("/test_case.html?", test_case);
   if (!extra_params.empty())
     query = base::StringPrintf("%s&%s", query.c_str(), extra_params.c_str());
 
   return http_server.GetURL(query);
 }
 
 PPAPITest::PPAPITest() : in_process_(true) {
 }
 
 void PPAPITest::SetUpCommandLine(base::CommandLine* command_line) {
@@ skipping 164 matching lines @@
     const std::string& base,
     const std::string& test_case) {
   return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
                             test_case.c_str());
 }
 
 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
   // The default content setting for the PPAPI broker is ASK. We purposefully
   // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
 }