Refactor UITestBase/ProxyLauncher.

chrome/browser/sessions/session_restore_uitest.cc

Index: chrome/browser/sessions/session_restore_uitest.cc
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 051ecf7a0ad5ed755dc7defe7ee334a1df8079ea..5dcbb77bca356e39fdd1c6806c84ee90f8846e18 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -32,7 +32,7 @@ class SessionRestoreUITest : public UITest {
 
   virtual void QuitBrowserAndRestore(int expected_tab_count) {
 #if defined(OS_MACOSX)
-    shutdown_type_ = UITestBase::USER_QUIT;
+    shutdown_type_ = ProxyLauncher::USER_QUIT;
 #endif
     UITest::TearDown();
 
@@ -444,7 +444,7 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) {
 // process.)
 // Flaky as per http://crbug.com/52022
 TEST_F(SessionRestoreUITest, FLAKY_ShareProcessesOnRestore) {
-  if (in_process_renderer()) {
+  if (ProxyLauncher::in_process_renderer()) {
     // No point in running this test in single process mode.
     return;
   }