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 272dcf42fb6ab2eac06f48cef6d1c63e8aa3f5fb..831cbc9fd5fbb893ba8e3818600230d9e0fd3732 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);
         if (restored_tab) {
           restored_tab->GetController().LoadIfNecessary();
           RecordAppLaunch(profile(), tab);
@@ -546,9 +546,8 @@ void TabRestoreService::PopulateTab(Tab* tab,
       tab->extension_app_id = extension->id();
   }
 
-  // TODO(ajwong): This does not correctly handle storage for isolated apps.
-  tab->session_storage_namespace =
-        controller->GetSessionStorageNamespaceMap().find("")->second;
+  tab->session_storage_namespace_map =
+      controller->GetSessionStorageNamespaceMap();
 
   // Delegate may be NULL during unit tests.
   if (delegate) {
@@ -997,7 +996,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);
   } else {
     // We only respsect the tab's original browser if there's no disposition.
     if (disposition == UNKNOWN && tab.has_browser())
@@ -1031,7 +1030,7 @@ TabRestoreServiceDelegate* TabRestoreService::RestoreTab(
         disposition != NEW_BACKGROUND_TAB,
         tab.pinned,
         tab.from_last_session,
-        tab.session_storage_namespace);
+        tab.session_storage_namespace_map);
     web_contents->GetController().LoadIfNecessary();
   }
   RecordAppLaunch(profile(), tab);