Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/ui/browser_tabrestore.h

Index: chrome/browser/ui/browser_tabrestore.h
diff --git a/chrome/browser/ui/browser_tabrestore.h b/chrome/browser/ui/browser_tabrestore.h
index a951a7c462a96f1936c5ca2d80f6399ff54d5e70..2f77f522ebed10c3f8821a8007dd9767f0370dc1 100644
--- a/chrome/browser/ui/browser_tabrestore.h
+++ b/chrome/browser/ui/browser_tabrestore.h
@@ -8,11 +8,11 @@
 #include <vector>
 
 #include "chrome/browser/sessions/session_types.h"
+#include "content/public/browser/navigation_controller.h"
 
 class Browser;
 
 namespace content {
-class SessionStorageNamespace;
 class WebContents;
 }
 
@@ -43,7 +43,7 @@ content::WebContents* AddRestoredTab(
     bool select,
     bool pin,
     bool from_last_session,
-    content::SessionStorageNamespace* storage_namespace,
+    const content::SessionStorageNamespaceMap& storage_namespace_map,
     const std::string& user_agent_override);
 
 // Replaces the state of the currently selected tab with the session
@@ -54,7 +54,7 @@ void ReplaceRestoredTab(
     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);