Fix tabs duplication when restoring last closed window.

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_
 
 #include <map>
 #include <string>
 
@@ skipping 124 matching lines @@
   // Notification that a tab has been closed. |closed_by_user_gesture| comes
   // from |WebContents::closed_by_user_gesture|; see it for details.
   //
   // Note: this is invoked from the NavigationController's destructor, which is
   // after the actual tab has been removed.
   void TabClosed(const SessionID& window_id,
                  const SessionID& tab_id,
                  bool closed_by_user_gesture);
 
   // Notification a window has opened.
-  void WindowOpened(Browser* browser);
+  // Do not perform restoration if |dont_restore| is true.
+  void WindowOpened(Browser* browser, bool dont_restore);
 
   // Notification the window is about to close.
   void WindowClosing(const SessionID& window_id);
 
   // Notification a window has finished closing.
   void WindowClosed(const SessionID& window_id);
 
   // Called when a tab is inserted.
   void TabInserted(content::WebContents* contents);
 
@@ skipping 85 matching lines @@
   // restored upon session restore.
   bool ShouldRestoreWindowOfType(sessions::SessionWindow::WindowType type,
                                  AppType app_type) const;
 
   // Removes unrestorable windows from the previous windows list.
   void RemoveUnusedRestoreWindows(
       std::vector<sessions::SessionWindow*>* window_list);
 
   // Implementation of RestoreIfNecessary. If |browser| is non-null and we need
   // to restore, the tabs are added to it, otherwise a new browser is created.
+  // Skip restoration if |dont_restore| is true.
   bool RestoreIfNecessary(const std::vector<GURL>& urls_to_open,
-                          Browser* browser);
+                          Browser* browser, bool dont_restore);
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // chrome::BrowserListObserver
   void OnBrowserAdded(Browser* browser) override {}
   void OnBrowserRemoved(Browser* browser) override {}
   void OnBrowserSetLastActive(Browser* browser) override;
 
@@ skipping 139 matching lines @@
   // For browser_tests, since we want to simulate the browser shutting down
   // without quitting.
   bool force_browser_not_alive_with_no_windows_;
 
   base::WeakPtrFactory<SessionService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_