Make PPAPI test servers start in parallel

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/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
 #include "net/base/test_data_directory.h"
-#include "net/test/test_server.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "ui/gl/gl_switches.h"
 #include "webkit/plugins/plugin_switches.h"
 
 using content::DomOperationNotificationDetails;
 using content::RenderViewHost;
 
 namespace {
 
 // Platform-specific filename relative to the chrome executable.
@@ skipping 118 matching lines @@
 void PPAPITestBase::RunTestAndReload(const std::string& test_case) {
   GURL url = GetTestFileUrl(test_case);
   RunTestURL(url);
   // If that passed, we simply run the test again, which navigates again.
   RunTestURL(url);
 }
 
 void PPAPITestBase::RunTestViaHTTP(const std::string& test_case) {
   FilePath document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
-  RunHTTPTestServer(document_root, test_case, "");
+  FilePath http_document_root;
+  ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
+  net::TestServer http_server(net::TestServer::TYPE_HTTP,
+                              net::TestServer::kLocalhost,
+                              document_root);
+  ASSERT_TRUE(http_server.Start());
+  RunTestURL(GetTestURL(http_server, test_case, ""));
 }
 
 void PPAPITestBase::RunTestWithSSLServer(const std::string& test_case) {
-  FilePath document_root;
-  ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
-                              net::BaseTestServer::SSLOptions(),
-                              document_root);
-  ASSERT_TRUE(test_server.Start());
-  uint16_t port = test_server.host_port_pair().port();
-  RunHTTPTestServer(document_root, test_case,
-                    StringPrintf("ssl_server_port=%d", port));
+  FilePath http_document_root;
+  ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
+  net::TestServer http_server(net::TestServer::TYPE_HTTP,
+                              net::TestServer::kLocalhost,
+                              http_document_root);
+  net::TestServer ssl_server(net::TestServer::TYPE_HTTPS,
+                             net::BaseTestServer::SSLOptions(),
+                             http_document_root);
+  // Start the servers in parallel.
+  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());
+
+  uint16_t port = ssl_server.host_port_pair().port();
+  RunTestURL(GetTestURL(http_server,
+                        test_case,
+                        StringPrintf("ssl_server_port=%d", port)));
 }
 
 void PPAPITestBase::RunTestWithWebSocketServer(const std::string& test_case) {
-  net::TestServer server(net::TestServer::TYPE_WS,
-                         net::TestServer::kLocalhost,
-                         net::GetWebSocketTestDataDirectory());
-  ASSERT_TRUE(server.Start());
-  uint16_t port = server.host_port_pair().port();
   FilePath http_document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
-  RunHTTPTestServer(http_document_root, test_case,
-                    StringPrintf("websocket_port=%d", port));
+  net::TestServer http_server(net::TestServer::TYPE_HTTP,
+                              net::TestServer::kLocalhost,
+                              http_document_root);
+  net::TestServer ws_server(net::TestServer::TYPE_WS,
+                            net::TestServer::kLocalhost,
+                            net::GetWebSocketTestDataDirectory());
+  // Start the servers in parallel.
+  ASSERT_TRUE(http_server.StartInBackground());
+  ASSERT_TRUE(ws_server.StartInBackground());
+  // Wait until they are both finished before continuing.
+  ASSERT_TRUE(http_server.BlockUntilStarted());
+  ASSERT_TRUE(ws_server.BlockUntilStarted());
+
+  uint16_t port = ws_server.host_port_pair().port();
+  RunTestURL(GetTestURL(http_server,
+                        test_case,
+                        StringPrintf("websocket_port=%d", port)));
 }
 
 void PPAPITestBase::RunTestIfAudioOutputAvailable(
     const std::string& test_case) {
   RunTest(test_case);
 }
 
 void PPAPITestBase::RunTestViaHTTPIfAudioOutputAvailable(
     const std::string& test_case) {
   RunTestViaHTTP(test_case);
@@ skipping 18 matching lines @@
   JavascriptTestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
       &handler);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   ASSERT_TRUE(observer.Run()) << handler.error_message();
   EXPECT_STREQ("PASS", handler.message().c_str());
 }
 
-void PPAPITestBase::RunHTTPTestServer(
-    const FilePath& document_root,
+GURL PPAPITestBase::GetTestURL(
+    const net::TestServer& http_server,
     const std::string& test_case,
     const std::string& extra_params) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTP,
-                              net::TestServer::kLocalhost,
-                              document_root);
-  ASSERT_TRUE(test_server.Start());
   std::string query = BuildQuery("files/test_case.html?", test_case);
   if (!extra_params.empty())
     query = StringPrintf("%s&%s", query.c_str(), extra_params.c_str());
 
-  GURL url = test_server.GetURL(query);
-  RunTestURL(url);
+  return http_server.GetURL(query);
 }
 
 PPAPITest::PPAPITest() {
 }
 
 void PPAPITest::SetUpCommandLine(CommandLine* command_line) {
   PPAPITestBase::SetUpCommandLine(command_line);
 
   // Append the switch to register the pepper plugin.
   // library name = <out dir>/<test_name>.<library_extension>
@@ skipping 68 matching lines @@
     const std::string& base,
     const std::string& test_case) {
   return 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.
 }