Convert the session restore ui_tests to browser_tests. I renabled the disabled tests; hopefully the…

chrome/test/automation/proxy_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 "chrome/test/automation/proxy_launcher.h"
 
 #include <vector>
 
 #include "base/environment.h"
 #include "base/file_util.h"
@@ skipping 196 matching lines @@
 
   if (!LaunchBrowserHelper(state, true, false, &process_)) {
     LOG(ERROR) << "LaunchBrowserHelper failed.";
     return false;
   }
   process_id_ = base::GetProcId(process_);
 
   return true;
 }
 
-#if !defined(OS_MACOSX)
-bool ProxyLauncher::LaunchAnotherBrowserBlockUntilClosed(
-    const LaunchState& state) {
-  return LaunchBrowserHelper(state, false, true, NULL);
-}
-#endif
-
 void ProxyLauncher::QuitBrowser() {
   // If we have already finished waiting for the browser to exit
   // (or it hasn't launched at all), there's nothing to do here.
   if (process_ == base::kNullProcessHandle || !automation_proxy_.get())
     return;
 
   if (SESSION_ENDING == shutdown_type_) {
     TerminateBrowser();
     return;
   }
@@ skipping 376 matching lines @@
   return LaunchBrowserAndServer(state, wait_for_initial_loads);
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }