| Index: chrome/test/nacl/nacl_browsertest_util.h
|
| diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
|
| index dafda2b056d61e834d5b528d3af052d108acd366..793c72099c78ae3a4384a0411d79a32259fe0c22 100644
|
| --- a/chrome/test/nacl/nacl_browsertest_util.h
|
| +++ b/chrome/test/nacl/nacl_browsertest_util.h
|
| @@ -73,7 +73,7 @@ class NaClBrowserTestBase : public InProcessBrowserTest {
|
|
|
| // Map a file relative to the variant directory to a URL served by the test
|
| // web server.
|
| - GURL TestURL(const FilePath::StringType& test_file);
|
| + GURL TestURL(const FilePath::StringType& url_fragment);
|
|
|
| // Load a URL and listen to automation events with a given handler.
|
| // Returns true if the test glue function correctly. (The handler should
|
| @@ -84,6 +84,15 @@ class NaClBrowserTestBase : public InProcessBrowserTest {
|
| // setting up other tests, such as checking that UMA data was logged.
|
| void RunLoadTest(const FilePath::StringType& test_file);
|
|
|
| + // Run a test that was originally written to use NaCl's integration testing
|
| + // jig. These tests were originally driven by NaCl's SCons build in the
|
| + // nacl_integration test stage on the Chrome waterfall. Changes in the
|
| + // boundaries between the Chrome and NaCl repos have resulted in many of
|
| + // these tests having a stronger affinity with the Chrome repo. This method
|
| + // provides a compatibility layer to simplify turning nacl_integration tests
|
| + // into browser tests.
|
| + void RunNaClIntegrationTest(const FilePath::StringType& url_fragment);
|
| +
|
| private:
|
| bool StartTestServer();
|
|
|
|
|