Add SiteInstance parameters to IndexedDBContext calls

chrome/browser/extensions/data_deleter.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/extensions/data_deleter.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
@@ skipping 36 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&DataDeleter::DeleteCookiesOnIOThread, deleter));
 
   content::BrowserContext::GetDefaultStoragePartition(profile)->
       GetDOMStorageContext()->DeleteOrigin(storage_origin);
 
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(
           &DataDeleter::DeleteIndexedDBOnWebkitThread,
-          deleter,
-          make_scoped_refptr(BrowserContext::GetIndexedDBContext(profile))));
+          deleter));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&DataDeleter::DeleteDatabaseOnFileThread, deleter));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&DataDeleter::DeleteFileSystemOnFileThread, deleter));
 
   BrowserThread::PostTask(
@@ skipping 11 matching lines @@
     Profile* profile,
     const std::string& extension_id,
     const GURL& storage_origin,
     bool is_storage_isolated)
     : extension_id_(extension_id) {
   // TODO(michaeln): Delete from the right StoragePartition.
   // http://crbug.com/85127
   database_tracker_ = BrowserContext::GetDefaultStoragePartition(profile)->
       GetDatabaseTracker();
   // Pick the right request context depending on whether it's an extension,
   // isolated app, or regular app.

[awong, 2012/09/10 21:55:21]

I think for right now, just use GetDefaultStoragePartition() for all cases
similar to how database_tracker_ works above.

That way, the various data types are are consistently broken. :)

[alecflett, 2012/09/10 23:14:55]

Heh, that seems very sad. But ok...it vastly simplifies this stuff then.

[awong, 2012/09/10 23:17:53]

Yeah it's sad...there's an outstanding bug to fix this.  It's actually next on
the hit list if you felt the urge to pick it up. Otherwise, I'll be looking at
it very soon.

+  content::StoragePartition* storage_partition;

[awong, 2012/09/10 21:55:21]

Initialize to NULL?

[alecflett, 2012/09/10 23:14:55]

I specifically didn't so clang would complain if I didn't.

(because currently there's no execution path that doesn't set storage_partition)

but in any case this becomes moot when I follow the above comment.

   if (storage_origin.SchemeIs(chrome::kExtensionScheme)) {
     extension_request_context_ = profile->GetRequestContextForExtensions();
+    storage_partition = BrowserContext::GetDefaultStoragePartition(profile);
   } else if (is_storage_isolated) {
+    GURL extension_url =
+        extensions::Extension::GetBaseURLFromExtensionId(extension_id);
+    ExtensionProcessManager* manager = profile->GetExtensionProcessManager();
+    content::SiteInstance* site_instance =
+        manager->GetSiteInstanceForURL(extension_url);
+    storage_partition =
+        BrowserContext::GetStoragePartition(profile, site_instance);
     extension_request_context_ =
         profile->GetRequestContextForIsolatedApp(extension_id);
     isolated_app_path_ = profile->GetPath().
         Append(content::kStoragePartitionDirname).AppendASCII(extension_id);
   } else {
     extension_request_context_ = profile->GetRequestContext();
+    storage_partition = BrowserContext::GetDefaultStoragePartition(profile);
   }
+
   file_system_context_ = BrowserContext::GetFileSystemContext(profile);
+  indexed_db_context_ = storage_partition->GetIndexedDBContext();
+
   storage_origin_ = storage_origin;
   origin_id_ =
       webkit_database::DatabaseUtil::GetOriginIdentifier(storage_origin_);
 }
 
 DataDeleter::~DataDeleter() {
 }
 
 void DataDeleter::DeleteCookiesOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   net::CookieMonster* cookie_monster =
       extension_request_context_->GetURLRequestContext()->cookie_store()->
           GetCookieMonster();
   if (cookie_monster)
     cookie_monster->DeleteAllForHostAsync(
         storage_origin_, net::CookieMonster::DeleteCallback());
 }
 
 void DataDeleter::DeleteDatabaseOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   int rv = database_tracker_->DeleteDataForOrigin(
       origin_id_, net::CompletionCallback());
   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() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   file_system_context_->DeleteDataForOriginOnFileThread(storage_origin_);
 
   // TODO(creis): The following call fails because the request context is still
   // around, and holding open file handles in this directory.
   // See http://crbug.com/85127
   if (!isolated_app_path_.empty())
     file_util::Delete(isolated_app_path_, true);
 }
 
 void DataDeleter::DeleteAppcachesOnIOThread(
     appcache::AppCacheService* appcache_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   appcache_service->DeleteAppCachesForOrigin(storage_origin_,
                                              net::CompletionCallback());
 }
 
 }  // namespace extensions