Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/session_types.h

Index: chrome/browser/sessions/session_types.h
diff --git a/chrome/browser/sessions/session_types.h b/chrome/browser/sessions/session_types.h
index b8a23bf27d1d88e78780482296292e989de37ac7..7f552fbe4290ed2739a2f86f24abd0e12f63b0fb 100644
--- a/chrome/browser/sessions/session_types.h
+++ b/chrome/browser/sessions/session_types.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -171,8 +172,8 @@ struct SessionTab {
 
   std::vector<TabNavigation> navigations;
 
-  // For reassociating sessionStorage.
-  std::string session_storage_persistent_id;
+  // Maps the storage partition id to its session storage persistent id.
+  std::map<std::string, std::string> session_storage_persistent_id_map;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionTab);