Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/ui/browser_tab_restore_service_delegate.cc

Index: chrome/browser/ui/browser_tab_restore_service_delegate.cc
diff --git a/chrome/browser/ui/browser_tab_restore_service_delegate.cc b/chrome/browser/ui/browser_tab_restore_service_delegate.cc
index 2e9ad7f495a379c0802d2b5483a5e064f68c8bb4..8c6baa00b71c6989c4d0ab84ade88fa7d04df48c 100644
--- a/chrome/browser/ui/browser_tab_restore_service_delegate.cc
+++ b/chrome/browser/ui/browser_tab_restore_service_delegate.cc
@@ -58,10 +58,10 @@ WebContents* BrowserTabRestoreServiceDelegate::AddRestoredTab(
       bool select,
       bool pin,
       bool from_last_session,
-      SessionStorageNamespace* storage_namespace) {
+      const content::SessionStorageNamespaceMap& storage_namespace_map) {
   return chrome::AddRestoredTab(browser_, navigations, tab_index,
                                 selected_navigation, extension_app_id, select,
-                                pin, from_last_session, storage_namespace);
+                                pin, from_last_session, storage_namespace_map);
 }
 
 void BrowserTabRestoreServiceDelegate::ReplaceRestoredTab(
@@ -69,10 +69,11 @@ void BrowserTabRestoreServiceDelegate::ReplaceRestoredTab(
       int selected_navigation,
       bool from_last_session,
       const std::string& extension_app_id,
-      SessionStorageNamespace* session_storage_namespace) {
+      const content::SessionStorageNamespaceMap&
+          session_storage_namespace_map) {
   chrome::ReplaceRestoredTab(browser_, navigations, selected_navigation,
                              from_last_session, extension_app_id,
-                             session_storage_namespace);
+                             session_storage_namespace_map);
 }
 
 void BrowserTabRestoreServiceDelegate::CloseTab() {