Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/session_restore.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/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/platform_file.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabrestore.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 550 matching lines @@
 
     RecordAppLaunchForTab(browser, tab, selected_index);
 
     if (disposition == CURRENT_TAB) {
       DCHECK(!use_new_window);
       chrome::ReplaceRestoredTab(browser,
                                  tab.navigations,
                                  selected_index,
                                  true,
                                  tab.extension_app_id,
-                                 NULL);
+                                 content::SessionStorageNamespaceMap());
     } else {
       int tab_index = use_new_window ? 0 : browser->active_index() + 1;
       WebContents* web_contents = chrome::AddRestoredTab(
           browser,
           tab.navigations,
           tab_index,
           selected_index,
           tab.extension_app_id,
           false,  // selected
           tab.pinned,
           true,
-          NULL);
+          content::SessionStorageNamespaceMap());
       // Start loading the tab immediately.
       web_contents->GetController().LoadIfNecessary();
     }
 
     if (use_new_window) {
       chrome::ActivateTabAt(browser, 0, true);
       browser->window()->Show();
     }
     NotifySessionServiceOfRestoredTabs(browser, browser->tab_count());
 
@@ skipping 253 matching lines @@
     DCHECK(!tab.navigations.empty());
     int selected_index = tab.current_navigation_index;
     selected_index = std::max(
         0,
         std::min(selected_index,
                  static_cast<int>(tab.navigations.size() - 1)));
 
     RecordAppLaunchForTab(browser, tab, selected_index);
 
     // Associate sessionStorage (if any) to the restored tab.
-    scoped_refptr<content::SessionStorageNamespace> session_storage_namespace;
-    if (!tab.session_storage_persistent_id.empty()) {
-      session_storage_namespace =
-          content::BrowserContext::GetDefaultDOMStorageContext(profile_)->
-          RecreateSessionStorage(tab.session_storage_persistent_id);
+    content::SessionStorageNamespaceMap restored_session_storage_namespaces;
+    for (std::map<std::string, std::string>::const_iterator it =
+             tab.session_storage_persistent_id_map.begin();
+         it != tab.session_storage_persistent_id_map.end();
+         ++it) {
+      using content::BrowserContext;
+      if (BrowserContext::IsValidStoragePartitionId(profile_, it->first)) {
+        restored_session_storage_namespaces[it->first] =
+            BrowserContext::GetDOMStorageContextByPartitionId(profile_,
+                                                              it->first)->
+                RecreateSessionStorage(it->second);
+      }
     }
 
     WebContents* web_contents =
         chrome::AddRestoredTab(browser,
                                tab.navigations,
                                tab_index,
                                selected_index,
                                tab.extension_app_id,
                                false,  // select
                                tab.pinned,
                                true,
-                               session_storage_namespace.get());
+                               restored_session_storage_namespaces);
     // Regression check: check that the tab didn't start loading right away. The
     // focused tab will be loaded by Browser, and TabLoader will load the rest.
     DCHECK(web_contents->GetController().NeedsReload());
 
     // Set up the file access rights for the selected navigation entry.
     const int id = web_contents->GetRenderProcessHost()->GetID();
     const int read_file_permissions =
         base::PLATFORM_FILE_OPEN |
         base::PLATFORM_FILE_READ |
         base::PLATFORM_FILE_EXCLUSIVE_READ |
@@ skipping 184 matching lines @@
   if (active_session_restorers == NULL)
     return false;
   for (std::set<SessionRestoreImpl*>::const_iterator it =
            active_session_restorers->begin();
        it != active_session_restorers->end(); ++it) {
     if ((*it)->profile() == profile)
       return true;
   }
   return false;
 }