Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

chrome/browser/ui/browser_tabstrip.h

Index: chrome/browser/ui/browser_tabstrip.h
diff --git a/chrome/browser/ui/browser_tabstrip.h b/chrome/browser/ui/browser_tabstrip.h
index 3eb2722756417614f45c187586d8bbb656feec48..ba9906a09129035d1ab50c132db4820d50c5ce1c 100644
--- a/chrome/browser/ui/browser_tabstrip.h
+++ b/chrome/browser/ui/browser_tabstrip.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_
 
 #include "content/public/common/page_transition_types.h"
+#include "content/public/browser/navigation_controller.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
@@ -14,7 +15,6 @@ class Profile;
 class TabContents;
 
 namespace content {
-class SessionStorageNamespace;
 class SiteInstance;
 class WebContents;
 }
@@ -66,14 +66,28 @@ void CloseWebContents(Browser* browser, content::WebContents* contents);
 
 void CloseAllTabs(Browser* browser);
 
-// Centralized method for creating a TabContents, configuring and
+// Centralized methods for creating a TabContents, configuring and
 // installing all its supporting objects and observers.
 TabContents* TabContentsFactory(
     Profile* profile,
     content::SiteInstance* site_instance,
     int routing_id,
+    const content::WebContents* base_web_contents);
+
+// Same as TabContentsFactory, but allows specifying the initial
+// |session_storage_namespace_map|.  This is for supporting session restore
+// where we reconstitute the session storage namespaces for a browsing context.
+//
+// You do not want to call this. If you think you do, make sure you completely
+// understand when SessionStorageNamespace objects should be cloned, why
+// they should not be shared by multiple WebContents, and what bad things
+// can happen if you share the object.
+TabContents* TabContentsWithSessionStorageFactory(
+    Profile* profile,
+    content::SiteInstance* site_instance,
+    int routing_id,
     const content::WebContents* base_web_contents,
-    content::SessionStorageNamespace* session_storage_namespace);
+    const content::SessionStorageNamespaceMap& session_storage_namespace_map);
 
 }  // namespace chrome