Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

chrome/browser/chrome_content_browser_client.h

Index: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 6e4cb51ab9e90b20953237ac70632be5e9908b0e..3784e22090b32efb5b3980491478ef6ea96c1423 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -17,6 +17,10 @@ namespace content {
 class QuotaPermissionContext;
 }
 
+namespace extensions {
+class Extension;
+}
+
 class PrefService;
 
 namespace chrome {
@@ -37,6 +41,12 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   virtual std::string GetStoragePartitionIdForChildProcess(
       content::BrowserContext* browser_context,
       int child_process_id) OVERRIDE;
+  virtual std::string GetStoragePartitionIdForSiteInstance(
+      content::BrowserContext* browser_context,
+      content::SiteInstance* instance) OVERRIDE;
+  virtual bool IsValidStoragePartitionId(
+      content::BrowserContext* browser_context,
+      const std::string& partition_id) OVERRIDE;
   virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
       content::WebContents* web_contents) OVERRIDE;
   virtual void RenderViewHostCreated(
@@ -214,6 +224,12 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   // Sets io_thread_application_locale_ to the given value.
   void SetApplicationLocaleOnIOThread(const std::string& locale);
 
+  // Helper function for getting the storage partition id from an Extension
+  // object.
+  std::string GetStoragePartitionIdForExtension(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension);
+
   // Set of origins that can use TCP/UDP private APIs from NaCl.
   std::set<std::string> allowed_socket_origins_;