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

chrome/browser/sessions/session_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 35 matching lines @@
 // with incognito windows.
 //
 // SessionService itself maintains a set of SessionCommands that allow
 // SessionService to rebuild the open state of the browser (as
 // SessionWindow, SessionTab and TabNavigation). The commands are periodically
 // flushed to SessionBackend and written to a file. Every so often
 // SessionService rebuilds the contents of the file from the open state
 // 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 {
     TYPE_APP,
     TYPE_NORMAL
   };
 
   // Creates a SessionService for the specified profile.
   explicit SessionService(Profile* profile);
   // For testing.
@@ skipping 313 matching lines @@
 
   // Returns true if we should record a window close as pending.
   // |has_open_trackable_browsers_| must be up-to-date before calling this.
   bool should_record_close_as_pending() const {
     // When this is called, the browser window being closed is still open, hence
     // still in the browser list. If there is a browser window other than the
     // one being closed but no trackable windows, then the others must be App
     // 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);
   }
 
   // Call when certain session relevant notifications
   // (tab_closed, nav_list_pruned) occur.  In addition, this is
   // currently called when Save() is called to compare how often the
   // session data is currently saved verses when we may want to save it.
   // It records the data in UMA stats.
   void RecordSessionUpdateHistogramData(int type,
     base::TimeTicks* last_updated_time);
@@ skipping 55 matching lines @@
   base::TimeTicks last_updated_tab_closed_time_;
   base::TimeTicks last_updated_nav_list_pruned_time_;
   base::TimeTicks last_updated_nav_entry_commit_time_;
   base::TimeTicks last_updated_save_time_;
 
   // Constants used in calculating histogram data.
   const base::TimeDelta save_delay_in_millis_;
   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);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_