Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/tab_restore_service_delegate.h

Index: chrome/browser/sessions/tab_restore_service_delegate.h
diff --git a/chrome/browser/sessions/tab_restore_service_delegate.h b/chrome/browser/sessions/tab_restore_service_delegate.h
index 3fd49fafeea34bb34a4d2d6fde67e3aba2894dc7..0c55d5806ab8d91be7afc6d61eb5d0df8d132314 100644
--- a/chrome/browser/sessions/tab_restore_service_delegate.h
+++ b/chrome/browser/sessions/tab_restore_service_delegate.h
@@ -9,13 +9,12 @@
 #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;
 }
 
@@ -51,14 +50,14 @@ class TabRestoreServiceDelegate {
       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;