Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/browser/browser_context.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 "content/public/browser/browser_context.h"
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "webkit/database/database_tracker.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/download/download_file_manager.h"
@@ skipping 15 matching lines @@
 using base::UserDataAdapter;
 
 // Key names on BrowserContext.
 static const char* kDownloadManagerKeyName = "download_manager";
 static const char* kStorageParitionMapKeyName = "content_storage_partition_map";
 
 namespace content {
 
 namespace {
 
-StoragePartition* GetStoragePartition(BrowserContext* browser_context,
-                                      int renderer_child_id) {
+StoragePartition* GetStoragePartitionByPartitionId(
+    BrowserContext* browser_context,
+    const std::string& partition_id) {
   StoragePartitionMap* partition_map = static_cast<StoragePartitionMap*>(
       browser_context->GetUserData(kStorageParitionMapKeyName));
   if (!partition_map) {
     partition_map = new StoragePartitionMap(browser_context);
     browser_context->SetUserData(kStorageParitionMapKeyName, partition_map);
   }
 
+  return partition_map->Get(partition_id);
+}
+
+StoragePartition* GetStoragePartition(BrowserContext* browser_context,
+                                      int renderer_child_id) {
   const std::string& partition_id =
       GetContentClient()->browser()->GetStoragePartitionIdForChildProcess(
           browser_context,
           renderer_child_id);
 
-  return partition_map->Get(partition_id);
+  return GetStoragePartitionByPartitionId(browser_context, partition_id);
 }
 
 // Run |callback| on each storage partition in |browser_context|.
 void ForEachStoragePartition(
     BrowserContext* browser_context,
     const base::Callback<void(StoragePartition*)>& callback) {
   StoragePartitionMap* partition_map = static_cast<StoragePartitionMap*>(
       browser_context->GetUserData(kStorageParitionMapKeyName));
   if (!partition_map) {
     return;
@@ skipping 89 matching lines @@
 }
 
 DOMStorageContext* BrowserContext::GetDOMStorageContext(
     BrowserContext* browser_context,
     int render_child_id) {
   StoragePartition* partition =
       GetStoragePartition(browser_context, render_child_id);
   return partition->dom_storage_context();
 }
 
+DOMStorageContext* BrowserContext::GetDOMStorageContextByPartitionId(

[Charlie Reis, 2012/08/06 20:38:30]

Is this worth exposing, as opposed to just calling
GetStoragePartitionByPartitionId(...)->dom_storage_context()?

[awong, 2012/08/08 18:08:28]

No it's not worth exposing.  But the other API doesn't exist yet. :)

That was precisely my next CL.

+    BrowserContext* browser_context,
+    const std::string& partition_id) {
+  StoragePartition* partition =
+      GetStoragePartitionByPartitionId(browser_context, partition_id);
+  return partition->dom_storage_context();
+}
+
 IndexedDBContext* BrowserContext::GetIndexedDBContext(
     BrowserContext* browser_context) {
   // TODO(ajwong): Change this API to require a process id instead of using
   // kInvalidChildProcessId.
   StoragePartition* partition =
       GetStoragePartition(browser_context,
                           ChildProcessHostImpl::kInvalidChildProcessId);
   return partition->indexed_db_context();
 }
 
@@ skipping 73 matching lines @@
   ForEachDOMStorageContext(browser_context,
                            base::Bind(&DOMStorageContextImpl::PurgeMemory));
 }
 
 BrowserContext::~BrowserContext() {
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 }  // namespace content