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

chrome/test/automation/proxy_launcher.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
 #define CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 71 matching lines @@
   // Launches the IPC testing connection in client mode,
   // which then attempts to connect to a browser.
   // Returns true on success.
   bool ConnectToRunningBrowser(bool wait_for_initial_loads) WARN_UNUSED_RESULT;
 
   // Paired with LaunchBrowserAndServer().
   // Closes the browser and IPC testing server.
   void CloseBrowserAndServer();
 
   // Launches the browser with the given command line. Returns true on success.
-  // TODO(phajdan.jr): Make LaunchBrowser private. Tests should use
-  // LaunchAnotherBrowserBlockUntilClosed.
+  // TODO(phajdan.jr): Make LaunchBrowser private.
   bool LaunchBrowser(const LaunchState& state) WARN_UNUSED_RESULT;
 
-#if !defined(OS_MACOSX)
-  // This function is not defined on the Mac because the concept
-  // doesn't apply to Mac; you can't have N browser processes.
-
-  // Launches another browser process and waits for it to finish.
-  // Returns true on success.
-  bool LaunchAnotherBrowserBlockUntilClosed(const LaunchState& state);
-#endif
-
   // Exits out of browser instance.
   void QuitBrowser();
 
   // Terminates the browser, simulates end of session.
   void TerminateBrowser();
 
   // Check that no processes related to Chrome exist, displaying
   // the given message if any do.
   void AssertAppNotRunning(const std::string& error_message);
 
@@ skipping 146 matching lines @@
 
  protected:
   std::string channel_id_;      // Channel id of automation proxy.
   bool disconnect_on_failure_;  // True if we disconnect on IPC channel failure.
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AnonymousProxyLauncher);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_