Make an empty content browser test work.

chrome/test/base/chrome_test_launcher.cc

 // Copyright (c) 2011 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/test/test_launcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 23 matching lines @@
   virtual ~ChromeTestLauncherDelegate() {
   }
 
   virtual void EarlyInitialize() OVERRIDE {
 #if defined(OS_MACOSX)
     chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
   }
 
   virtual bool Run(int argc, char** argv, int* return_code) OVERRIDE {
+#if defined(OS_WIN)
     CommandLine* command_line = CommandLine::ForCurrentProcess();
-
-    // 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(test_launcher::kSingleProcessTestsFlag) ||
-        command_line->HasSwitch(
-            test_launcher::kSingleProcessTestsAndChromeFlag) ||
-        command_line->HasSwitch(test_launcher::kGTestListTestsFlag) ||
-        command_line->HasSwitch(test_launcher::kGTestHelpFlag)) {
-#if defined(OS_WIN)
-      if (command_line->HasSwitch(test_launcher::kSingleProcessTestsFlag)) {
-        // This is the browser process, so setup the sandbox broker.
-        sandbox::BrokerServices* broker_services =
-            sandbox::SandboxFactory::GetBrokerServices();
-        if (broker_services) {
-          sandbox::InitBrokerServices(broker_services);
-          // Precreate the desktop and window station used by the renderers.
-          sandbox::TargetPolicy* policy = broker_services->CreatePolicy();
-          sandbox::ResultCode result = policy->CreateAlternateDesktop(true);
-          CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result);
-          policy->Release();
-        }
-      }
-#endif
-      *return_code = ChromeTestSuite(argc, argv).Run();
-      return true;
-    }
-
-#if defined(OS_WIN)
     if (command_line->HasSwitch(switches::kProcessType)) {
       // This is a child process, call ChromeMain.
       FilePath chrome_path(command_line->GetProgram().DirName());
       chrome_path = chrome_path.Append(chrome::kBrowserResourcesDll);
       HMODULE dll = LoadLibrary(chrome_path.value().c_str());
       DLL_MAIN entry_point =
           reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll, "ChromeMain"));
       if (!entry_point)
         return false;
 
       // Initialize the sandbox services.
       sandbox::SandboxInterfaceInfo sandbox_info = {0};
       sandbox_info.target_services =
           sandbox::SandboxFactory::GetTargetServices();
       *return_code =
           entry_point(GetModuleHandle(NULL), &sandbox_info, GetCommandLineW());
       return true;
     }
 #endif  // defined(OS_WIN)
+
     return false;
   }
 
+  virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
+    return ChromeTestSuite(argc, argv).Run();
+  }
+
   virtual bool AdjustChildProcessCommandLine(
       CommandLine* command_line) OVERRIDE {
     CommandLine new_command_line(command_line->GetProgram());
     CommandLine::SwitchMap switches = command_line->GetSwitches();
 
     // Strip out user-data-dir if present.  We will add it back in again later.
     switches.erase(switches::kUserDataDir);
 
     for (CommandLine::SwitchMap::const_iterator iter = switches.begin();
          iter != switches.end(); ++iter) {
@@ skipping 16 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate);
 };
 
 int main(int argc, char** argv) {
   ChromeTestLauncherDelegate launcher_delegate;
   return test_launcher::LaunchTests(&launcher_delegate, argc, argv);
 }