Make session restore understand that tabs have multiple SessionStorageNamespaces.

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* GetStoragePartitionByPartitionId(
-    BrowserContext* browser_context,
-    const std::string& partition_id) {
-  StoragePartitionImplMap* partition_map =
-      static_cast<StoragePartitionImplMap*>(
-          browser_context->GetUserData(kStorageParitionMapKeyName));
-  if (!partition_map) {
-    partition_map = new StoragePartitionImplMap(browser_context);
-    browser_context->SetUserData(kStorageParitionMapKeyName, partition_map);
-  }
-
-  return partition_map->Get(partition_id);
-}
-
-// Run |callback| on each DOMStorageContextImpl in |browser_context|.
 void PurgeDOMStorageContextInPartition(const std::string& id,
                                        StoragePartition* storage_partition) {
   static_cast<StoragePartitionImpl*>(storage_partition)->
       GetDOMStorageContext()->PurgeMemory();
 }
 
+void KeepSessionStateInPartition(const std::string& id,
+                                 StoragePartition* storage_partition) {
+  static_cast<StoragePartitionImpl*>(storage_partition)->
+      GetDOMStorageContext()->SetForceKeepSessionState();
+}
+
 void SaveSessionStateOnIOThread(ResourceContext* resource_context) {
   resource_context->GetRequestContext()->cookie_store()->GetCookieMonster()->
       SetForceKeepSessionState();
   resource_context->GetRequestContext()->server_bound_cert_service()->
       GetCertStore()->SetForceKeepSessionState();
   ResourceContext::GetAppCacheService(resource_context)->
       set_force_keep_session_state();
 }
 
 void SaveSessionStateOnWebkitThread(
@@ skipping 60 matching lines @@
   return GetDefaultStoragePartition(browser_context)->GetAppCacheService();
 }
 
 fileapi::FileSystemContext* BrowserContext::GetFileSystemContext(
     BrowserContext* browser_context) {
   // TODO(ajwong): Change this API to require a SiteInstance instead of
   // using GetDefaultStoragePartition().
   return GetDefaultStoragePartition(browser_context)->GetFileSystemContext();
 }
 
+bool BrowserContext::IsValidPartitionId(BrowserContext* browser_context,
+                                        const std::string& partition_id) {
+  return GetContentClient()->browser()->IsValidStoragePartitionId(
+      browser_context, partition_id);
+}
+
 StoragePartition* BrowserContext::GetStoragePartition(
     BrowserContext* browser_context,
     SiteInstance* site_instance) {
   std::string partition_id;  // Default to "" for NULL |site_instance|.
 
   // TODO(ajwong): After GetDefaultStoragePartition() is removed, get rid of
   // this conditional and require that |site_instance| is non-NULL.
   if (site_instance) {
     partition_id = GetContentClient()->browser()->
         GetStoragePartitionIdForSiteInstance(browser_context,
                                              site_instance);
   }
 
-  return GetStoragePartitionByPartitionId(browser_context, partition_id);
+  return GetStoragePartitionById(browser_context, partition_id);
+}
+
+StoragePartition* BrowserContext::GetStoragePartitionById(
+    BrowserContext* browser_context,
+    const std::string& partition_id) {
+  StoragePartitionImplMap* partition_map =
+      static_cast<StoragePartitionImplMap*>(
+          browser_context->GetUserData(kStorageParitionMapKeyName));
+  if (!partition_map) {
+    partition_map = new StoragePartitionImplMap(browser_context);
+    browser_context->SetUserData(kStorageParitionMapKeyName, partition_map);
+  }
+
+  return partition_map->Get(partition_id);
 }
 
 void BrowserContext::ForEachStoragePartition(
     BrowserContext* browser_context,
     const StoragePartitionCallback& callback) {
   StoragePartitionImplMap* partition_map =
       static_cast<StoragePartitionImplMap*>(
           browser_context->GetUserData(kStorageParitionMapKeyName));
   if (!partition_map)
     return;
@@ skipping 21 matching lines @@
 void BrowserContext::SaveSessionState(BrowserContext* browser_context) {
   GetDatabaseTracker(browser_context)->SetForceKeepSessionState();
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SaveSessionStateOnIOThread,
                    browser_context->GetResourceContext()));
   }
 
-  DOMStorageContextImpl* dom_storage_context_impl =
-      static_cast<DOMStorageContextImpl*>(
-          GetDefaultStoragePartition(browser_context)->GetDOMStorageContext());
-  dom_storage_context_impl->SetForceKeepSessionState();
+  ForEachStoragePartition(browser_context,
+                          base::Bind(&KeepSessionStateInPartition));
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
     IndexedDBContextImpl* indexed_db = static_cast<IndexedDBContextImpl*>(
         GetIndexedDBContext(browser_context));
     BrowserThread::PostTask(
         BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
         base::Bind(&SaveSessionStateOnWebkitThread,
                    make_scoped_refptr(indexed_db)));
   }
 }
 
 void BrowserContext::PurgeMemory(BrowserContext* browser_context) {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&PurgeMemoryOnIOThread,
                    browser_context->GetResourceContext()));
   }
 
   ForEachStoragePartition(browser_context,
                           base::Bind(&PurgeDOMStorageContextInPartition));
 }
 
 BrowserContext::~BrowserContext() {
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 }  // namespace content