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

chrome/browser/sessions/session_service.h

Index: chrome/browser/sessions/session_service.h
===================================================================
--- chrome/browser/sessions/session_service.h	(revision 133679)
+++ chrome/browser/sessions/session_service.h	(working copy)
@@ -53,7 +53,8 @@
 // of the browser.
 class SessionService : public BaseSessionService,
                        public content::NotificationObserver {
-  friend class SessionServiceTestHelper;
+  friend class SessionRestoreTest;
+  friend class SessionServiceTestHelper;  
  public:
   // Used to distinguish an application window from a normal one.
   enum AppType {
@@ -387,6 +388,7 @@
     // windows or similar. In this case, we record the close as pending.
     return !has_open_trackable_browsers_ &&
         (!browser_defaults::kBrowserAliveWithNoWindows ||
+         force_browser_not_alive_with_no_windows_ ||
          BrowserList::size() > 1);
   }
 
@@ -462,6 +464,10 @@
   const base::TimeDelta save_delay_in_mins_;
   const base::TimeDelta save_delay_in_hrs_;
 
+  // For browser_tests, since we want to simulate the browser shutting down
+  // without quitting.
+  bool force_browser_not_alive_with_no_windows_;
+
   DISALLOW_COPY_AND_ASSIGN(SessionService);
 };