diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 22:13:08 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 22:13:08 +0000 |
| commit | f93ae60203dd5c83aefbd1d0881e05639aa50780 (patch) | |
| tree | f60bc8c09d994663e1afaab0f4583e67e3bcc465 /content/test/content_test_launcher.cc | |
| parent | 759e69acff6343087c743aab9a8299ae028c646d (diff) | |
| download | chromium_src-f93ae60203dd5c83aefbd1d0881e05639aa50780.zip chromium_src-f93ae60203dd5c83aefbd1d0881e05639aa50780.tar.gz chromium_src-f93ae60203dd5c83aefbd1d0881e05639aa50780.tar.bz2 | |
InProcessBrowserTest.Empty is only valid for browser_tests, so ask the test delegate whether they have an empty test or not and get the test name then. Also get rid of the EarlyInitialize function since it's called right in the beginning, and the delegate can just do that work before calling TestLauncher.
BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10807043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_launcher.cc')
| -rw-r--r-- | content/test/content_test_launcher.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index d5b9c8f..e9dc6a3 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -87,13 +87,11 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase { class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate { public: - ContentTestLauncherDelegate() { - } - - virtual ~ContentTestLauncherDelegate() { - } + ContentTestLauncherDelegate() {} + virtual ~ContentTestLauncherDelegate() {} - virtual void EarlyInitialize() OVERRIDE { + virtual std::string GetEmptyTestName() OVERRIDE { + return std::string(); } virtual bool Run(int argc, char** argv, int* return_code) OVERRIDE { |