Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/tab_restore_service.cc

Index: chrome/browser/sessions/tab_restore_service.cc
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index d66cc8c112452d0f9277eb3dd9f1a8eb653a9e8c..6eb3a2e5645df5849bda36acc19a30b5843f38ab 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -379,7 +379,7 @@ void TabRestoreService::RestoreEntryById(TabRestoreServiceDelegate* delegate,
                                      static_cast<int>(tab_i) ==
                                          window->selected_tab_index,
                                      tab.pinned, tab.from_last_session,
-                                     tab.session_storage_namespace,
+                                     tab.session_storage_namespace_map,
                                      tab.user_agent_override);
         if (restored_tab) {
           restored_tab->GetController().LoadIfNecessary();
@@ -551,8 +551,8 @@ void TabRestoreService::PopulateTab(Tab* tab,
       controller->GetWebContents()->GetUserAgentOverride();
 
   // TODO(ajwong): This does not correctly handle storage for isolated apps.
-  tab->session_storage_namespace =
-      controller->GetDefaultSessionStorageNamespace();
+  tab->session_storage_namespace_map =
+      controller->GetSessionStorageNamespaceMap();
 
   // Delegate may be NULL during unit tests.
   if (delegate) {
@@ -1001,7 +1001,7 @@ TabRestoreServiceDelegate* TabRestoreService::RestoreTab(
                                  tab.current_navigation_index,
                                  tab.from_last_session,
                                  tab.extension_app_id,
-                                 tab.session_storage_namespace,
+                                 tab.session_storage_namespace_map,
                                  tab.user_agent_override);
   } else {
     // We only respsect the tab's original browser if there's no disposition.
@@ -1036,7 +1036,7 @@ TabRestoreServiceDelegate* TabRestoreService::RestoreTab(
         disposition != NEW_BACKGROUND_TAB,
         tab.pinned,
         tab.from_last_session,
-        tab.session_storage_namespace,
+        tab.session_storage_namespace_map,
         tab.user_agent_override);
     web_contents->GetController().LoadIfNecessary();
   }