Will no longer force jobs=1 with filters in bot mode.

base/test/launcher/test_launcher.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/launcher/test_launcher.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #endif
 
@@ skipping 611 matching lines @@
   CHECK(UnsetEnvironmentVariableIfExists("GTEST_TOTAL_SHARDS"));
   CHECK(UnsetEnvironmentVariableIfExists("GTEST_SHARD_INDEX"));
 
   if (command_line->HasSwitch(kGTestRepeatFlag) &&
       !StringToInt(command_line->GetSwitchValueASCII(kGTestRepeatFlag),
                    &cycles_)) {
     LOG(ERROR) << "Invalid value for " << kGTestRepeatFlag;
     return false;
   }
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kTestLauncherRetryLimit)) {
+  if (command_line->HasSwitch(switches::kTestLauncherRetryLimit)) {
     int retry_limit = -1;
-    if (!StringToInt(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+    if (!StringToInt(command_line->GetSwitchValueASCII(
                          switches::kTestLauncherRetryLimit), &retry_limit) ||
         retry_limit < 0) {
       LOG(ERROR) << "Invalid value for " << switches::kTestLauncherRetryLimit;
       return false;
     }
 
     retry_limit_ = retry_limit;
-  } else if (!CommandLine::ForCurrentProcess()->HasSwitch(kGTestFilterFlag)) {
-    // Retry failures 3 times by default if we are running all of the tests.
+  } else if (!command_line->HasSwitch(kGTestFilterFlag) || BotModeEnabled()) {
+    // Retry failures 3 times by default if we are running all of the tests or
+    // in bot mode.
     retry_limit_ = 3;
   }
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kTestLauncherJobs)) {
+  if (command_line->HasSwitch(switches::kTestLauncherJobs)) {
     int jobs = -1;
-    if (!StringToInt(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+    if (!StringToInt(command_line->GetSwitchValueASCII(
                          switches::kTestLauncherJobs), &jobs) ||
         jobs < 0) {
       LOG(ERROR) << "Invalid value for " << switches::kTestLauncherJobs;
       return false;
     }
 
     parallel_jobs_ = jobs;
-  } else if (CommandLine::ForCurrentProcess()->HasSwitch(kGTestFilterFlag)) {
+  } else if (command_line->HasSwitch(kGTestFilterFlag) && !BotModeEnabled()) {
     // Do not run jobs in parallel by default if we are running a subset of
-    // the tests.
+    // the tests and if bot mode is off.
     parallel_jobs_ = 1;
   }
 
   fprintf(stdout, "Using %" PRIuS " parallel jobs.\n", parallel_jobs_);
   fflush(stdout);
   worker_pool_owner_.reset(
       new SequencedWorkerPoolOwner(parallel_jobs_, "test_launcher"));
 
   if (command_line->HasSwitch(switches::kTestLauncherFilterFile) &&
       command_line->HasSwitch(kGTestFilterFlag)) {
@@ skipping 424 matching lines @@
 
     g_live_processes.Get().erase(process_handle);
   }
 
   base::CloseProcessHandle(process_handle);
 
   return exit_code;
 }
 
 }  // namespace base