Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/tab_restore_service_delegate.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_DELEGATE_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/sessions/session_id.h"
+#include "content/public/browser/navigation_controller.h"
 
 class Profile;
 class TabNavigation;
 
 namespace content {
-class NavigationController;
-class SessionStorageNamespace;
 class WebContents;
 }
 
 // Objects implement this interface to provide necessary functionality for
 // TabRestoreService to operate. These methods are mostly copies of existing
 // Browser methods.
 class TabRestoreServiceDelegate {
  public:
   // see BrowserWindow::Show()
   virtual void ShowBrowserWindow() = 0;
@@ skipping 15 matching lines @@
   virtual content::WebContents* GetActiveWebContents() const = 0;
   virtual bool IsTabPinned(int index) const = 0;
   virtual content::WebContents* AddRestoredTab(
       const std::vector<TabNavigation>& navigations,
       int tab_index,
       int selected_navigation,
       const std::string& extension_app_id,
       bool select,
       bool pin,
       bool from_last_session,
-      content::SessionStorageNamespace* storage_namespace,
+      const content::SessionStorageNamespaceMap& storage_namespace_map,
       const std::string& user_agent_override) = 0;
   virtual void ReplaceRestoredTab(
       const std::vector<TabNavigation>& navigations,
       int selected_navigation,
       bool from_last_session,
       const std::string& extension_app_id,
-      content::SessionStorageNamespace* session_storage_namespace,
+      const content::SessionStorageNamespaceMap& storage_namespace_map,
       const std::string& user_agent_override) = 0;
   virtual void CloseTab() = 0;
 
   // see Browser::Create
   static TabRestoreServiceDelegate* Create(Profile* profile,
                                            const std::string& app_name);
 
   // see browser::FindBrowserForWebContents
   static TabRestoreServiceDelegate* FindDelegateForWebContents(
       const content::WebContents* contents);
 
   // see browser::FindBrowserWithID
   static TabRestoreServiceDelegate* FindDelegateWithID(
       SessionID::id_type desired_id);
 
  protected:
   virtual ~TabRestoreServiceDelegate() {}
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_DELEGATE_H_