Allow running browser tests each in single-process mode. This is useful for Android team, which wan…

content/public/test/test_launcher.cc

 // Copyright (c) 2012 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 "content/public/test/test_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 679 matching lines @@
   g_launcher_delegate = launcher_delegate;
 
   CommandLine::Init(argc, argv);
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(kHelpFlag)) {
     PrintUsage();
     return 0;
   }
 
-  // TODO(pkasting): This "single_process vs. single-process" design is
-  // terrible UI.  Instead, there should be some sort of signal flag on the
-  // command line, with all subsequent arguments passed through to the
-  // underlying browser.
   if (command_line->HasSwitch(kSingleProcessTestsFlag) ||
-      command_line->HasSwitch(kSingleProcessTestsAndChromeFlag) ||
+      (command_line->HasSwitch(kSingleProcessTestsAndChromeFlag) &&
+       command_line->HasSwitch(kGTestFilterFlag)) ||
       command_line->HasSwitch(kGTestListTestsFlag) ||
       command_line->HasSwitch(kGTestHelpFlag)) {
 #if defined(OS_WIN)
     if (command_line->HasSwitch(kSingleProcessTestsFlag)) {
       sandbox::SandboxInterfaceInfo sandbox_info;
       content::InitializeSandboxInfo(&sandbox_info);
       content::InitializeSandbox(&sandbox_info);
     }
 #endif
     return launcher_delegate->RunTestSuite(argc, argv);
   }
 
   if (ShouldRunContentMain())
     return RunContentMain(argc, argv, launcher_delegate);
 
   base::AtExitManager at_exit;
 
   int32 total_shards;
   int32 shard_index;
   bool should_shard = ShouldShard(&total_shards, &shard_index);
 
   fprintf(stdout,
       "Starting tests...\n"
       "IMPORTANT DEBUGGING NOTE: each test is run inside its own process.\n"
       "For debugging a test inside a debugger, use the\n"
       "--gtest_filter=<your_test_name> flag along with either\n"
-      "--single_process (to run all tests in one launcher/browser process) or\n"
-      "--single-process (to do the above, and also run Chrome in single-\n"
+      "--single_process (to run the test in one launcher/browser process) or\n"
+      "--single-process (to do the above, and also run Chrome in single-"
       "process mode).\n");
 
   testing::InitGoogleTest(&argc, argv);
   TestTimeouts::Initialize();
   int exit_code = 0;
 
   std::string empty_test = launcher_delegate->GetEmptyTestName();
   if (!empty_test.empty()) {
     // Make sure the entire browser code is loaded into memory. Reading it
     // from disk may be slow on a busy bot, and can easily exceed the default
@@ skipping 35 matching lines @@
       cycles--;
   }
   return exit_code;
 }
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
   return g_launcher_delegate;
 }
 
 }  // namespace test_launcher