Refactor UITestBase/ProxyLauncher.

chrome/common/logging_chrome_uitest.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 80 matching lines @@
 
 // Launch the app in assertion test mode, then close the app.
 #if defined(OS_WIN)
 // http://crbug.com/26715
 #define Assertion DISABLED_Assertion
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define Assertion DISABLED_Assertion
 #endif
 TEST_F(AssertionTest, Assertion) {
-  if (UITest::in_process_renderer()) {
+  if (ProxyLauncher::in_process_renderer()) {
     // in process mode doesn't do the crashing.
     expected_errors_ = 0;
     expected_crashes_ = 0;
   } else {
     expected_errors_ = 1;
     expected_crashes_ = EXPECTED_ASSERT_CRASHES;
   }
 }
 #endif  // !defined(NDEBUG)
 
@@ skipping 14 matching lines @@
 
 #if defined(OS_WIN)
 // http://crbug.com/38497
 #define CheckFails FLAKY_CheckFails
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define CheckFails DISABLED_CheckFails
 #endif
 // Launch the app in assertion test mode, then close the app.
 TEST_F(CheckFalseTest, CheckFails) {
-  if (UITest::in_process_renderer()) {
+  if (ProxyLauncher::in_process_renderer()) {
     // in process mode doesn't do the crashing.
     expected_errors_ = 0;
     expected_crashes_ = 0;
   } else {
     expected_errors_ = 1;
     expected_crashes_ = EXPECTED_ASSERT_CRASHES;
   }
 }
 #endif  // !defined(OFFICIAL_BUILD)
 
@@ skipping 17 matching lines @@
 
 #if defined(OS_CHROMEOS)
 // http://crbug.com/43115
 #define Crash DISABLED_Crash
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define Crash DISABLED_Crash
 #endif
 // Launch the app in renderer crash test mode, then close the app.
 TEST_F(RendererCrashTest, Crash) {
-  if (UITest::in_process_renderer()) {
+  if (ProxyLauncher::in_process_renderer()) {
     // in process mode doesn't do the crashing.
     expected_crashes_ = 0;
   } else {
     scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
     ASSERT_TRUE(browser.get());
     ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
     expected_crashes_ = EXPECTED_CRASH_CRASHES;
   }
 }