Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/tab_restore_service.h

Index: chrome/browser/sessions/tab_restore_service.h
diff --git a/chrome/browser/sessions/tab_restore_service.h b/chrome/browser/sessions/tab_restore_service.h
index 3fea7fbadd7ba0a1bc572ec740c596930f8c848a..0c9a938cd22a0968d12ca80a9bc9cb77ae12089c 100644
--- a/chrome/browser/sessions/tab_restore_service.h
+++ b/chrome/browser/sessions/tab_restore_service.h
@@ -15,6 +15,7 @@
 #include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_types.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/session_storage_namespace.h"
 #include "webkit/glue/window_open_disposition.h"
 
@@ -102,8 +103,8 @@ class TabRestoreService : public BaseSessionService {
     // If non-empty gives the id of the extension for the tab.
     std::string extension_app_id;
 
-    // The associated session storage namespace (if any).
-    scoped_refptr<content::SessionStorageNamespace> session_storage_namespace;
+    // The associated session storage namespaces (if any).
+    content::SessionStorageNamespaceMap session_storage_namespace_map;
 
     // The user agent override used for the tab's navigations (if applicable).
     std::string user_agent_override;