Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/tab_restore_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sessions/tab_restore_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 361 matching lines @@
       delegate = TabRestoreServiceDelegate::Create(profile(), window->app_name);
       for (size_t tab_i = 0; tab_i < window->tabs.size(); ++tab_i) {
         const Tab& tab = window->tabs[tab_i];
         WebContents* restored_tab =
             delegate->AddRestoredTab(tab.navigations, delegate->GetTabCount(),
                                      tab.current_navigation_index,
                                      tab.extension_app_id,
                                      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);
         }
       }
       // All the window's tabs had the same former browser_id.
       if (window->tabs[0].has_browser()) {
         UpdateTabBrowserIDs(window->tabs[0].browser_id,
                             delegate->GetSessionID().id());
       }
@@ skipping 146 matching lines @@
   TabContents* tab_contents =
       TabContents::FromWebContents(controller->GetWebContents());
   // tab_contents is NULL in some browser tests.
   if (tab_contents) {
     const extensions::Extension* extension =
         tab_contents->extension_tab_helper()->extension_app();
     if (extension)
       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) {
     tab->browser_id = delegate->GetSessionID().id();
     tab->pinned = delegate->IsTabPinned(tab->tabstrip_index);
   }
 }
 
 void TabRestoreService::NotifyTabsChanged() {
   FOR_EACH_OBSERVER(TabRestoreServiceObserver, observer_list_,
@@ skipping 428 matching lines @@
 
 TabRestoreServiceDelegate* TabRestoreService::RestoreTab(
     const Tab& tab,
     TabRestoreServiceDelegate* delegate,
     WindowOpenDisposition disposition) {
   if (disposition == CURRENT_TAB && delegate) {
     delegate->ReplaceRestoredTab(tab.navigations,
                                  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())
       delegate = TabRestoreServiceDelegate::FindDelegateWithID(tab.browser_id);
 
     int tab_index = -1;
 
     // |delegate| will be NULL in cases where one isn't already available (eg,
     // when invoked on Mac OS X with no windows open). In this case, create a
     // new browser into which we restore the tabs.
@@ skipping 13 matching lines @@
     }
 
     WebContents* web_contents = delegate->AddRestoredTab(
         tab.navigations,
         tab_index,
         tab.current_navigation_index,
         tab.extension_app_id,
         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);
   return delegate;
 }
 
 
 bool TabRestoreService::ValidateTab(Tab* tab) {
   if (tab->navigations.empty())
     return false;
@@ skipping 201 matching lines @@
   // the front, not the end and we just added the entries to the end).
   entries_to_write_ = staging_entries_.size();
 
   PruneEntries();
   NotifyTabsChanged();
 }
 
 Time TabRestoreService::TimeNow() const {
   return time_factory_ ? time_factory_->TimeNow() : Time::Now();
 }