| Index: base/test/launcher/unit_test_launcher.cc
|
| diff --git a/base/test/launcher/unit_test_launcher.cc b/base/test/launcher/unit_test_launcher.cc
|
| index c9924efa582ec388a7325d6db59d1134e3302b87..98a2fa1cf960f07fa92a62d27ac4a9af3195b214 100644
|
| --- a/base/test/launcher/unit_test_launcher.cc
|
| +++ b/base/test/launcher/unit_test_launcher.cc
|
| @@ -32,10 +32,6 @@ const size_t kDefaultTestBatchLimit = 10;
|
|
|
| const char kHelpFlag[] = "help";
|
|
|
| -// Flag to enable the new launcher logic.
|
| -// TODO(phajdan.jr): Remove it, http://crbug.com/236893 .
|
| -const char kBraveNewTestLauncherFlag[] = "brave-new-test-launcher";
|
| -
|
| // Flag to run all tests in a single process.
|
| const char kSingleProcessTestsFlag[] = "single-process-tests";
|
|
|
| @@ -71,7 +67,6 @@ CommandLine GetCommandLineForChildGTestProcess(
|
| new_cmd_line.AppendSwitchPath(switches::kTestLauncherOutput, output_file);
|
| new_cmd_line.AppendSwitchASCII(kGTestFilterFlag, JoinString(test_names, ":"));
|
| new_cmd_line.AppendSwitch(kSingleProcessTestsFlag);
|
| - new_cmd_line.AppendSwitch(kBraveNewTestLauncherFlag);
|
|
|
| return new_cmd_line;
|
| }
|
| @@ -446,8 +441,7 @@ int LaunchUnitTestsInternal(int argc,
|
| int default_jobs) {
|
| CommandLine::Init(argc, argv);
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(kGTestHelpFlag) ||
|
| - CommandLine::ForCurrentProcess()->HasSwitch(kSingleProcessTestsFlag) ||
|
| - !CommandLine::ForCurrentProcess()->HasSwitch(kBraveNewTestLauncherFlag)) {
|
| + CommandLine::ForCurrentProcess()->HasSwitch(kSingleProcessTestsFlag)) {
|
| return run_test_suite.Run();
|
| }
|
|
|
|
|