Refactor UITestBase/ProxyLauncher.

chrome/test/ui/ui_test_suite.cc

 // Copyright (c) 2010 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 "chrome/test/ui/ui_test_suite.h"
 
 #include <string>
 
 #include "base/environment.h"
 #include "base/path_service.h"
@@ skipping 13 matching lines @@
     : ChromeTestSuite(argc, argv) {
 #if defined(OS_WIN)
   crash_service_ = NULL;
 #endif
 }
 
 void UITestSuite::Initialize() {
   ChromeTestSuite::Initialize();
 
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-  UITest::set_in_process_renderer(
+  ProxyLauncher::set_in_process_renderer(
       parsed_command_line.HasSwitch(switches::kSingleProcess));
-  UITest::set_no_sandbox(
+  ProxyLauncher::set_no_sandbox(
       parsed_command_line.HasSwitch(switches::kNoSandbox));
-  UITest::set_full_memory_dump(
+  ProxyLauncher::set_full_memory_dump(
       parsed_command_line.HasSwitch(switches::kFullMemoryCrashReport));
-  UITest::set_safe_plugins(
+  ProxyLauncher::set_safe_plugins(
       parsed_command_line.HasSwitch(switches::kSafePlugins));
-  UITest::set_dump_histograms_on_exit(
+  ProxyLauncher::set_dump_histograms_on_exit(
       parsed_command_line.HasSwitch(switches::kDumpHistogramsOnExit));
-  UITest::set_enable_dcheck(
+  ProxyLauncher::set_enable_dcheck(
       parsed_command_line.HasSwitch(switches::kEnableDCHECK));
-  UITest::set_silent_dump_on_dcheck(
+  ProxyLauncher::set_silent_dump_on_dcheck(
       parsed_command_line.HasSwitch(switches::kSilentDumpOnDCHECK));
-  UITest::set_disable_breakpad(
+  ProxyLauncher::set_disable_breakpad(
       parsed_command_line.HasSwitch(switches::kDisableBreakpad));
 
 #if defined(OS_WIN)
   int batch_count = 0;
   int batch_index = 0;
   std::string batch_count_str =
       parsed_command_line.GetSwitchValueASCII(UITestSuite::kBatchCount);
   if (!batch_count_str.empty()) {
     base::StringToInt(batch_count_str, &batch_count);
   }
@@ skipping 12 matching lines @@
     std::string batch_index_env(UITestSuite::kGTestShardIndex);
     batch_index_env.append(batch_index_str);
     _putenv(batch_count_env.c_str());
     _putenv(batch_index_env.c_str());
   }
 #endif
 
   std::string js_flags =
     parsed_command_line.GetSwitchValueASCII(switches::kJavaScriptFlags);
   if (!js_flags.empty())
-    UITest::set_js_flags(js_flags);
+    ProxyLauncher::set_js_flags(js_flags);
   std::string log_level =
     parsed_command_line.GetSwitchValueASCII(switches::kLoggingLevel);
   if (!log_level.empty())
-    UITest::set_log_level(log_level);
+    ProxyLauncher::set_log_level(log_level);
 
 #if defined(OS_WIN)
   LoadCrashService();
 #endif
 }
 
 void UITestSuite::Shutdown() {
 #if defined(OS_WIN)
   if (crash_service_)
     base::KillProcess(crash_service_, 0, false);
 #endif
 
   ChromeTestSuite::Shutdown();
 }
 
 void UITestSuite::SuppressErrorDialogs() {
   TestSuite::SuppressErrorDialogs();
-  UITest::set_show_error_dialogs(false);
+  ProxyLauncher::set_show_error_dialogs(false);
 }
 
 #if defined(OS_WIN)
 void UITestSuite::LoadCrashService() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   if (env->HasVar(env_vars::kHeadless))
     return;
 
   if (base::GetProcessCount(L"crash_service.exe", NULL))
     return;
 
   FilePath exe_dir;
   if (!PathService::Get(base::DIR_EXE, &exe_dir)) {
     DCHECK(false);
     return;
   }
 
   FilePath crash_service = exe_dir.Append(L"crash_service.exe");
   if (!base::LaunchApp(crash_service.ToWStringHack(), false, false,
                        &crash_service_)) {
     printf("Couldn't start crash_service.exe, so this ui_test run won't tell " \
            "you if any test crashes!\n");
     return;
   }
 
   printf("Started crash_service.exe so you know if a test crashes!\n");
 }
 #endif