Make PPAPI test servers start in parallel

chrome/test/ppapi/ppapi_test.h

 // 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.
 
 #ifndef CHROME_TEST_PPAPI_PPAPI_TEST_H_
 #define CHROME_TEST_PPAPI_PPAPI_TEST_H_
 
 #include <list>
 #include <string>
 
 #include "base/basictypes.h"
 #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;
 }
 
 class PPAPITestMessageHandler : public TestMessageHandler {
  public:
   PPAPITestMessageHandler();
 
   MessageResponse HandleMessage(const std::string& json);
@@ skipping 49 matching lines @@
    private:
     content::NotificationRegistrar registrar_;
     std::list<bool> expected_infobars_;
   };
 
   // Runs the test for a tab given the tab that's already navigated to the
   // given URL.
   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);
 };
 
 // In-process plugin test runner.  See OutOfProcessPPAPITest below for the
 // out-of-process version.
 class PPAPITest : public PPAPITestBase {
  public:
   PPAPITest();
@@ skipping 41 matching lines @@
                                  const std::string& test_case) OVERRIDE;
 };
 
 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
  public:
   // PPAPITestBase override:
   virtual void SetUpOnMainThread() OVERRIDE;
 };
 
 #endif  // CHROME_TEST_PPAPI_PPAPI_TEST_H_