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 {
 
 // Returns the index to insert a tab at during session restore and startup.
 // |relative_index| gives the index of the url into the number of tabs that
 // are going to be opened. For example, if three urls are passed in on the
 // command line this is invoked three times with the values 0, 1 and 2.
 int GetIndexForInsertionDuringRestore(Browser* browser, int relative_index);
@@ skipping 10 matching lines @@
 // the regular user agent is overridden.
 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,
     const std::string& user_agent_override);
 
 // 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,
     const std::string& user_agent_override);
 
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_