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

chrome/test/automation/proxy_launcher.h

Index: chrome/test/automation/proxy_launcher.h
===================================================================
--- chrome/test/automation/proxy_launcher.h	(revision 133679)
+++ chrome/test/automation/proxy_launcher.h	(working copy)
@@ -89,19 +89,9 @@
   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();