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 dec8e6118054b59c4ea94d4c714c3ed37c382590..b16645a04c64bfb9dae277f6e6a86afeddb91221 100644
--- a/chrome/browser/ui/browser_tab_restore_service_delegate.cc
+++ b/chrome/browser/ui/browser_tab_restore_service_delegate.cc
@@ -14,7 +14,7 @@
 #include "content/public/browser/navigation_controller.h"
 
 using content::NavigationController;
-using content::SessionStorageNamespace;
+using content::SessionStorageNamespaceMap;
 using content::WebContents;
 
 void BrowserTabRestoreServiceDelegate::ShowBrowserWindow() {
@@ -58,11 +58,11 @@ WebContents* BrowserTabRestoreServiceDelegate::AddRestoredTab(
       bool select,
       bool pin,
       bool from_last_session,
-      SessionStorageNamespace* storage_namespace,
+      const SessionStorageNamespaceMap& storage_namespace_map,
       const std::string& user_agent_override) {
   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,
                                 user_agent_override);
 }
 
@@ -71,11 +71,11 @@ void BrowserTabRestoreServiceDelegate::ReplaceRestoredTab(
       int selected_navigation,
       bool from_last_session,
       const std::string& extension_app_id,
-      SessionStorageNamespace* session_storage_namespace,
+      const SessionStorageNamespaceMap& storage_namespace_map,
       const std::string& user_agent_override) {
   chrome::ReplaceRestoredTab(browser_, navigations, selected_navigation,
                              from_last_session, extension_app_id,
-                             session_storage_namespace, user_agent_override);
+                             storage_namespace_map, user_agent_override);
 }
 
 void BrowserTabRestoreServiceDelegate::CloseTab() {