Make session restore understand that tabs have multiple SessionStorageNamespaces.

chrome/browser/ui/browser_tabrestore.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_UI_BROWSER_TABRESTORE_H_
 #define CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_
 
 #include <vector>
 
 #include "chrome/browser/sessions/session_types.h"
+#include "content/public/browser/navigation_controller.h"
 
 class Browser;
 
 namespace content {
 class SessionStorageNamespace;
 class WebContents;
 }
 
 namespace chrome {
 
@@ skipping 13 matching lines @@
 // |navigations| are from the previous session.
 content::WebContents* AddRestoredTab(
     Browser* browser,
     const std::vector<TabNavigation>& navigations,
     int tab_index,
     int selected_navigation,
     const std::string& extension_app_id,
     bool select,
     bool pin,
     bool from_last_session,
-    content::SessionStorageNamespace* storage_namespace);
+    const content::SessionStorageNamespaceMap& storage_namespace_map);
 
 // Replaces the state of the currently selected tab with the session
 // history restored from the SessionRestore system.
 void ReplaceRestoredTab(
     Browser* browser,
     const std::vector<TabNavigation>& navigations,
     int selected_navigation,
     bool from_last_session,
     const std::string& extension_app_id,
-    content::SessionStorageNamespace* session_storage_namespace);
+    const content::SessionStorageNamespaceMap& storage_namespace_map);
 
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_