Chromium Code Reviews| Index: content/public/test/test_launcher.h |
| diff --git a/content/public/test/test_launcher.h b/content/public/test/test_launcher.h |
| index 4efdb6610ef1399471c3561366bbeba234e684e0..05da650204da72c9c1e213f678837b9669f56213 100644 |
| --- a/content/public/test/test_launcher.h |
| +++ b/content/public/test/test_launcher.h |
| @@ -17,6 +17,10 @@ namespace base { |
| class RunLoop; |
| } |
| +namespace content { |
| +class ContentMainDelegate; |
| +} |
| + |
| namespace test_launcher { |
| extern const char kEmptyTestName[]; |
| @@ -30,14 +34,16 @@ extern const char kSingleProcessTestsFlag[]; |
| extern const char kSingleProcessTestsAndChromeFlag[]; |
| extern const char kRunManualTestsFlag[]; |
| extern const char kHelpFlag[]; |
| +extern const char kLaunchAsBrowser[]; |
|
jam
2012/09/04 15:18:14
nit: order
phoglund_chromium
2012/09/05 09:41:05
Done.
|
| // Flag that causes only the kEmptyTestName test to be run. |
| extern const char kWarmupFlag[]; |
| class TestLauncherDelegate { |
| public: |
| + virtual bool Run(int argc, char** argv, int* return_code); |
| + |
|
jam
2012/09/04 15:18:14
TestLauncherDelegate is an interface for the deleg
phoglund_chromium
2012/09/05 09:41:05
Done.
|
| virtual std::string GetEmptyTestName() = 0; |
| - virtual bool Run(int argc, char** argv, int* return_code) = 0; |
| virtual int RunTestSuite(int argc, char** argv) = 0; |
| virtual bool AdjustChildProcessCommandLine(CommandLine* command_line, |
| const FilePath& temp_data_dir) = 0; |
| @@ -46,6 +52,7 @@ class TestLauncherDelegate { |
| protected: |
| virtual ~TestLauncherDelegate(); |
| + virtual content::ContentMainDelegate* CreateContentMainDelegate() = 0; |
|
jam
2012/09/04 15:18:14
... and then this would be in the public section l
phoglund_chromium
2012/09/05 09:41:05
Done.
|
| }; |
| int LaunchTests(TestLauncherDelegate* launcher_delegate, |