Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/sessions/session_types.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_SESSION_TYPES_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "googleurl/src/gurl.h"
@@ skipping 155 matching lines @@
 
   // If non-empty, this string is used as the user agent whenever the tab's
   // NavigationEntries need it overridden.
   std::string user_agent_override;
 
   // Timestamp for when this tab was last modified.
   base::Time timestamp;
 
   std::vector<TabNavigation> navigations;
 
-  // For reassociating sessionStorage.
-  std::string session_storage_persistent_id;
+  // Maps the storage partition id to its session storage persistent id.
+  std::map<std::string, std::string> session_storage_persistent_id_map;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionTab);
 };
 
 // SessionWindow -------------------------------------------------------------
 
 // Describes a saved window.
 struct SessionWindow {
   SessionWindow();
@@ skipping 34 matching lines @@
   // Is the window maximized, minimized, or normal?
   ui::WindowShowState show_state;
 
   std::string app_name;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionWindow);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_