Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: chrome/test/ppapi/ppapi_test.h

Issue 12033057: Make PPAPI test servers start in parallel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..350c317db936b3a134ede1784a2187461bc10a36 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);
« no previous file with comments | « no previous file | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698