Make PPAPI test servers start in parallel

BUG=162094

Review URL: https://chromiumcodereview.appspot.com/12033057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178718 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 6 deletions

diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index 0afb371..350c317 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;
@@ -79,12 +80,12 @@ class PPAPITestBase : public InProcessBrowserTest {
   // 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.
-  void RunHTTPTestServer(const FilePath& document_root,
-                         const std::string& test_case,
-                         const std::string& extra_params);
+  // Gets the URL of the the given |test_case| for the given HTTP test server.
+  // If |extra_params| is non-empty, it will be appended as URL parameters.
+  GURL GetTestURL(const net::TestServer& http_server,
+                  const std::string& test_case,
+                  const std::string& extra_params);
+
   // 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);