Move IndexedDBContext into the StoragePartition and ensure isolation.

chrome/browser/extensions/data_deleter.cc

Index: chrome/browser/extensions/data_deleter.cc
diff --git a/chrome/browser/extensions/data_deleter.cc b/chrome/browser/extensions/data_deleter.cc
index 409b8dfa2949a3928ce7d735a3973939ea85fa90..4fb56ebc1edea6aee8c7d837027fe3785aee1c7a 100644
--- a/chrome/browser/extensions/data_deleter.cc
+++ b/chrome/browser/extensions/data_deleter.cc
@@ -54,8 +54,7 @@ void DataDeleter::StartDeleting(Profile* profile,
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(
           &DataDeleter::DeleteIndexedDBOnWebkitThread,
-          deleter,
-          make_scoped_refptr(BrowserContext::GetIndexedDBContext(profile))));
+          deleter));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
@@ -88,6 +87,8 @@ DataDeleter::DataDeleter(
       GetDatabaseTracker();
   // Pick the right request context depending on whether it's an extension,
   // isolated app, or regular app.
+  content::StoragePartition* storage_partition =
+          BrowserContext::GetDefaultStoragePartition(profile);

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

nit: wrong indent

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

Done.

   if (storage_origin.SchemeIs(chrome::kExtensionScheme)) {
     extension_request_context_ = profile->GetRequestContextForExtensions();
   } else if (is_storage_isolated) {
@@ -98,7 +99,10 @@ DataDeleter::DataDeleter(
   } else {
     extension_request_context_ = profile->GetRequestContext();
   }
+
   file_system_context_ = BrowserContext::GetFileSystemContext(profile);
+  indexed_db_context_ = storage_partition->GetIndexedDBContext();
+
   storage_origin_ = storage_origin;
   origin_id_ =
       webkit_database::DatabaseUtil::GetOriginIdentifier(storage_origin_);
@@ -124,10 +128,9 @@ void DataDeleter::DeleteDatabaseOnFileThread() {
   DCHECK(rv == net::OK || rv == net::ERR_IO_PENDING);
 }
 
-void DataDeleter::DeleteIndexedDBOnWebkitThread(
-    scoped_refptr<IndexedDBContext> indexed_db_context) {
+void DataDeleter::DeleteIndexedDBOnWebkitThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
-  indexed_db_context->DeleteForOrigin(storage_origin_);
+  indexed_db_context_->DeleteForOrigin(storage_origin_);
 }
 
 void DataDeleter::DeleteFileSystemOnFileThread() {