Move IndexedDBContext into the StoragePartition and ensure isolation.

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 85 matching lines @@
         kDownloadManagerKeyName,
         new UserDataAdapter<DownloadManager>(download_manager));
     download_manager->SetDelegate(context->GetDownloadManagerDelegate());
     download_manager->Init(context);
   }
 
   return UserDataAdapter<DownloadManager>::Get(
       context, kDownloadManagerKeyName);
 }
 
-IndexedDBContext* BrowserContext::GetIndexedDBContext(
-    BrowserContext* browser_context) {
-  // TODO(ajwong): Change this API to require a SiteInstance instead of
-  // using GetDefaultStoragePartition().
-  return GetDefaultStoragePartition(browser_context)->GetIndexedDBContext();
-}
-
 appcache::AppCacheService* BrowserContext::GetAppCacheService(
     BrowserContext* browser_context) {
   // TODO(ajwong): Change this API to require a SiteInstance instead of
   // using GetDefaultStoragePartition().
   return GetDefaultStoragePartition(browser_context)->GetAppCacheService();
 }
 
 fileapi::FileSystemContext* BrowserContext::GetFileSystemContext(
     BrowserContext* browser_context) {
   // TODO(ajwong): Change this API to require a SiteInstance instead of
@@ skipping 50 matching lines @@
   // and when that call returns it'll end rewriting its UserData map. It will
   // end up rewriting the same value but this still causes a race condition.
   //
   // See http://crbug.com/115678.
   GetDefaultStoragePartition(context);
 }
 
 void BrowserContext::SaveSessionState(BrowserContext* browser_context) {
   GetDefaultStoragePartition(browser_context)->GetDatabaseTracker()->
       SetForceKeepSessionState();
+  StoragePartition* storage_partition =
+          BrowserContext::GetDefaultStoragePartition(browser_context);

[Charlie Reis, 2012/09/15 00:55:58]

nit: wrong indent

[awong, 2012/09/15 01:19:37]

Done.

 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(
             &SaveSessionStateOnIOThread,
             make_scoped_refptr(browser_context->GetRequestContext()),
-            BrowserContext::GetDefaultStoragePartition(browser_context)->
-                GetAppCacheService()));
+            storage_partition->GetAppCacheService()));
   }
 
   DOMStorageContextImpl* dom_storage_context_impl =
       static_cast<DOMStorageContextImpl*>(
-          GetDefaultStoragePartition(browser_context)->GetDOMStorageContext());
+          storage_partition->GetDOMStorageContext());
   dom_storage_context_impl->SetForceKeepSessionState();
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
     IndexedDBContextImpl* indexed_db = static_cast<IndexedDBContextImpl*>(
-        GetIndexedDBContext(browser_context));
+        storage_partition->GetIndexedDBContext());
     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,
             BrowserContext::GetDefaultStoragePartition(browser_context)->
                 GetAppCacheService()));
   }
 
   ForEachStoragePartition(browser_context,
                           base::Bind(&PurgeDOMStorageContextInPartition));
 }
 
 BrowserContext::~BrowserContext() {
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 }  // namespace content