Chromium Code Reviews| 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..ffffdd20883d169b2102fe71871475f9a9dbbb1e 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 afinity with the Chrome repo. This method |
|
Mark Seaborn
2012/09/12 18:09:45
'affinity'
Nick Bray (chromium)
2012/09/12 20:50:59
Done.
|
| + // provides a compatability layer to simplify turning nacl_integration tests |
|
Mark Seaborn
2012/09/12 18:09:45
'compatibility'
Nick Bray (chromium)
2012/09/12 20:50:59
Done.
|
| + // into browser tests. |
| + void RunNaClIntegrationTest(const FilePath::StringType& url_fragment); |
| + |
| private: |
| bool StartTestServer(); |