Make PPAPI test servers start in parallel

chrome/test/ppapi/ppapi_test.h

Index: chrome/test/ppapi/ppapi_test.h
diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index 0afb371884fd96071eddbb1d0c0c01e30f7b235c..528b94c4ab86289c98ab20e6c774db89784474f9 100644
--- a/chrome/test/ppapi/ppapi_test.h
+++ b/chrome/test/ppapi/ppapi_test.h
@@ -12,6 +12,7 @@
 #include "base/compiler_specific.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/javascript_test_observer.h"
+#include "net/test/test_server.h"
 
 namespace content {
 class RenderViewHost;
@@ -81,10 +82,14 @@ class PPAPITestBase : public InProcessBrowserTest {
   void RunTestURL(const GURL& test_url);
   // Run the given |test_case| on a HTTP test server whose document root is
   // specified by |document_root|. |extra_params| will be passed as URL
-  // parameters to the test.
+  // parameters to the test. If |extra_server| is valid, we will wait on it to
+  // start before runnint the test. This is for cases where we need an
+  // additional server, such as a WebSockets server, so that we can start the
+  // two servers up in parallel.
   void RunHTTPTestServer(const FilePath& document_root,
                          const std::string& test_case,
-                         const std::string& extra_params);
+                         const std::string& extra_params,
+                         net::TestServer* extra_server);
   // Return the document root for the HTTP server on which tests will be run.
   // The result is placed in |document_root|. False is returned upon failure.
   bool GetHTTPDocumentRoot(FilePath* document_root);