Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

chrome/browser/chrome_content_browser_client.cc

 // 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 395 matching lines @@
 
 std::string ChromeContentBrowserClient::GetStoragePartitionIdForChildProcess(
     content::BrowserContext* browser_context,
     int child_process_id) {
   // In chrome, we use the extension ID as the partition ID. This works well
   // because the extension ID fits the partition ID pattern and currently only
   // apps can designate that storage should be isolated.
   Profile* profile = Profile::FromBrowserContext(browser_context);
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
+  std::string partition_id;
   if (extension_service) {
-    const extensions::Extension* installed_app = extension_service->
+    const extensions::Extension* extension = extension_service->
         GetInstalledAppForRenderer(child_process_id);
-    if (installed_app && installed_app->is_storage_isolated()) {
-      return installed_app->id();
+    if (extension && extension->is_storage_isolated()) {
+      partition_id = extension->id();
     }
   }
-  return std::string();
+
+  // Enforce that IsValidStoragePartitionId() implementation stays in sync.
+  DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
+  return partition_id;
+}
+
+std::string ChromeContentBrowserClient::GetStoragePartitionIdForSiteInstance(
+    content::BrowserContext* browser_context,
+    SiteInstance* instance) {
+  // In chrome, we use the extension ID as the partition ID. This works well
+  // because the extension ID fits the partition ID pattern and currently only
+  // apps can designate that storage should be isolated.
+  Profile* profile = Profile::FromBrowserContext(browser_context);
+  ExtensionService* extension_service =
+      extensions::ExtensionSystem::Get(profile)->extension_service();
+  std::string partition_id;
+  if (extension_service) {
+    const Extension* extension = extension_service->extensions()->
+        GetExtensionOrAppByURL(ExtensionURLInfo(instance->GetSite()));
+    if (extension && extension->is_storage_isolated()) {

[Charlie Reis, 2012/08/13 19:39:22]

As mentioned, please share from here down in a helper function, and move the
comment above to it.

nit: No braces on one line if.

[awong, 2012/08/13 21:29:19]

Done.

+      partition_id = extension->id();
+    }
+  }
+
+  // Enforce that IsValidStoragePartitionId() implementation stays in sync.
+  DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
+  return partition_id;
+}
+
+bool ChromeContentBrowserClient::IsValidStoragePartitionId(
+    content::BrowserContext* browser_context,
+    const std::string& partition_id) {
+  // The default ID is empty which is always allowed.
+  if (partition_id.empty())
+    return true;
+
+  // If it isn't empty, then it must belong to an extension of some sort. Parse
+  // out the extension ID and make sure it is still installed.
+  Profile* profile = Profile::FromBrowserContext(browser_context);
+  ExtensionService* extension_service =
+      extensions::ExtensionSystem::Get(profile)->extension_service();
+  if (!extension_service) {
+    // No extension service means no storage partitions in Chrome.
+    return false;
+  }
+
+  // See if we can find an extension. The |partition_id| is the extension ID so
+  // no parsing needed to be done.
+  return extension_service->GetExtensionById(partition_id, false) != NULL;
 }
 
 content::WebContentsViewDelegate*
     ChromeContentBrowserClient::GetWebContentsViewDelegate(
         content::WebContents* web_contents) {
   return chrome::CreateWebContentsViewDelegate(web_contents);
 }
 
 void ChromeContentBrowserClient::RenderViewHostCreated(
     RenderViewHost* render_view_host) {
@@ skipping 1247 matching lines @@
     io_thread_application_locale_ = locale;
 }
 
 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
     const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_thread_application_locale_ = locale;
 }
 
 }  // namespace chrome