diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 05:37:31 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 05:37:31 +0000 |
| commit | 2218b2e4e8bb2bf65319a12e656b71beea295907 (patch) | |
| tree | 070766920f4a12454e7e5a49a7e967fdfa9f4c77 /content/public | |
| parent | 29febdd448669aaae6b76bb8fe11cdd07716e9f5 (diff) | |
| download | chromium_src-2218b2e4e8bb2bf65319a12e656b71beea295907.zip chromium_src-2218b2e4e8bb2bf65319a12e656b71beea295907.tar.gz chromium_src-2218b2e4e8bb2bf65319a12e656b71beea295907.tar.bz2 | |
Cleanup: Remove a duplicate definition of the single-process switch.
Review URL: https://chromiumcodereview.appspot.com/11275297
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/test/test_launcher.cc | 3 | ||||
| -rw-r--r-- | content/public/test/test_launcher.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 1c4c3d7..2b25960 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc @@ -643,7 +643,6 @@ const char kLaunchAsBrowser[] = "as-browser"; const char kRunManualTestsFlag[] = "run-manual"; const char kSingleProcessTestsFlag[] = "single_process"; -const char kSingleProcessTestsAndChromeFlag[] = "single-process"; const char kWarmupFlag[] = "warmup"; @@ -696,7 +695,7 @@ int LaunchTests(TestLauncherDelegate* launcher_delegate, } if (command_line->HasSwitch(kSingleProcessTestsFlag) || - (command_line->HasSwitch(kSingleProcessTestsAndChromeFlag) && + (command_line->HasSwitch(switches::kSingleProcess) && command_line->HasSwitch(kGTestFilterFlag)) || command_line->HasSwitch(kGTestListTestsFlag) || command_line->HasSwitch(kGTestHelpFlag)) { diff --git a/content/public/test/test_launcher.h b/content/public/test/test_launcher.h index c82cae8..6a5e2a6 100644 --- a/content/public/test/test_launcher.h +++ b/content/public/test/test_launcher.h @@ -27,11 +27,10 @@ extern const char kGTestListTestsFlag[]; extern const char kGTestRepeatFlag[]; extern const char kGTestRunDisabledTestsFlag[]; extern const char kGTestOutputFlag[]; +extern const char kHelpFlag[]; extern const char kLaunchAsBrowser[]; -extern const char kSingleProcessTestsFlag[]; -extern const char kSingleProcessTestsAndChromeFlag[]; extern const char kRunManualTestsFlag[]; -extern const char kHelpFlag[]; +extern const char kSingleProcessTestsFlag[]; // Flag that causes only the kEmptyTestName test to be run. extern const char kWarmupFlag[]; |