Return webcontents and add in test.

chrome/browser/sessions/tab_restore_service_helper.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_TAB_RESTORE_SERVICE_HELPER_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_
 
 #include <set>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/ui/host_desktop.h"
 
 class Profile;
@@ skipping 53 matching lines @@
   ~TabRestoreServiceHelper();
 
   // Helper methods used to implement TabRestoreService.
   void AddObserver(TabRestoreServiceObserver* observer);
   void RemoveObserver(TabRestoreServiceObserver* observer);
   void CreateHistoricalTab(content::WebContents* contents, int index);
   void BrowserClosing(TabRestoreServiceDelegate* delegate);
   void BrowserClosed(TabRestoreServiceDelegate* delegate);
   void ClearEntries();
   const Entries& entries() const;
-  void RestoreMostRecentEntry(TabRestoreServiceDelegate* delegate,
-                              chrome::HostDesktopType host_desktop_type);
+  std::vector<content::WebContents*> RestoreMostRecentEntry(
+      TabRestoreServiceDelegate* delegate,
+      chrome::HostDesktopType host_desktop_type);
   Tab* RemoveTabEntryById(SessionID::id_type id);
-  void RestoreEntryById(TabRestoreServiceDelegate* delegate,
-                        SessionID::id_type id,
-                        chrome::HostDesktopType host_desktop_type,
-                        WindowOpenDisposition disposition);
+  std::vector<content::WebContents*> RestoreEntryById(
+      TabRestoreServiceDelegate* delegate,
+      SessionID::id_type id,
+      chrome::HostDesktopType host_desktop_type,
+      WindowOpenDisposition disposition);
 
   // Notifies observers the tabs have changed.
   void NotifyTabsChanged();
 
   // Notifies observers the service has loaded.
   void NotifyLoaded();
 
   // Adds |entry| to the list of entries and takes ownership. If |prune| is true
   // |PruneAndNotify| is invoked. If |to_front| is true the entry is added to
   // the front, otherwise the back. Normal closes go to the front, but
@@ skipping 22 matching lines @@
                    int index,
                    TabRestoreServiceDelegate* delegate,
                    content::NavigationController* controller);
 
   // This is a helper function for RestoreEntryById() for restoring a single
   // tab. If |delegate| is NULL, this creates a new window for the entry. This
   // returns the TabRestoreServiceDelegate into which the tab was restored.
   // |disposition| will be respected, but if it is UNKNOWN then the tab's
   // original attributes will be respected instead. If a new browser needs to be
   // created for this tab, it will be created on the desktop specified by
-  // |host_desktop_type|.
+  // |host_desktop_type|. If present, |contents| will be populated with the
+  // WebContents of the restored tab.
   TabRestoreServiceDelegate* RestoreTab(
       const Tab& tab,
       TabRestoreServiceDelegate* delegate,
       chrome::HostDesktopType host_desktop_type,
-      WindowOpenDisposition disposition);
+      WindowOpenDisposition disposition,
+      content::WebContents** contents);
 
   // Returns true if |tab| has more than one navigation. If |tab| has more
   // than one navigation |tab->current_navigation_index| is constrained based
   // on the number of navigations.
   static bool ValidateTab(Tab* tab);
 
   // Validates all the tabs in a window, plus the window's active tab index.
   static bool ValidateWindow(Window* window);
 
   // Returns true if |tab| is one we care about restoring.
@@ skipping 32 matching lines @@
   // corresponding BrowserClosed. We cache the set of delegates closing to
   // avoid creating historical tabs for them.
   std::set<TabRestoreServiceDelegate*> closing_delegates_;
 
   TimeFactory* const time_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_