Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/tab_restore_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 
 #include <list>
+#include <map>
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #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"
 
 class Profile;
 class TabRestoreServiceDelegate;
 class TabRestoreServiceObserver;
 struct SessionWindow;
 
 namespace content {
 class NavigationController;
@@ skipping 67 matching lines @@
 
     // Index within the tab strip. May be -1 for an unknown index.
     int tabstrip_index;
 
     // True if the tab was pinned.
     bool pinned;
 
     // 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;
   };
 
   // Represents a previously open window.
   struct Window : public Entry {
     Window();
     virtual ~Window();
 
@@ skipping 262 matching lines @@
   // loading LoadStateChanged is invoked, which adds these entries to
   // entries_.
   std::vector<Entry*> staging_entries_;
 
   TimeFactory* time_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_