From 5a9e4767704cdfea576cb6b934c3d0400beb738f Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 15 Mar 2012 04:08:51 +0000 Subject: Make the content::DOMStorageContext methods callable on the main thread and hide the threading details from the embedder. Review URL: https://chromiumcodereview.appspot.com/9704048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126835 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_data_deleter.cc | 15 ++------------- chrome/browser/extensions/extension_data_deleter.h | 5 ----- 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'chrome/browser/extensions') diff --git a/chrome/browser/extensions/extension_data_deleter.cc b/chrome/browser/extensions/extension_data_deleter.cc index ab92bae..7ab0f59 100644 --- a/chrome/browser/extensions/extension_data_deleter.cc +++ b/chrome/browser/extensions/extension_data_deleter.cc @@ -48,13 +48,8 @@ void ExtensionDataDeleter::StartDeleting( base::Bind( &ExtensionDataDeleter::DeleteCookiesOnIOThread, deleter)); - scoped_refptr dom_storage_context = - BrowserContext::GetDOMStorageContext(profile); - dom_storage_context->task_runner()->PostTask( - FROM_HERE, - base::Bind( - &ExtensionDataDeleter::DeleteLocalStorageInSequencedTask, deleter, - dom_storage_context)); + BrowserContext::GetDOMStorageContext(profile)->DeleteForOrigin( + deleter->origin_id_); BrowserThread::PostTask( BrowserThread::WEBKIT_DEPRECATED, FROM_HERE, @@ -127,12 +122,6 @@ void ExtensionDataDeleter::DeleteDatabaseOnFileThread() { DCHECK(rv == net::OK || rv == net::ERR_IO_PENDING); } -void ExtensionDataDeleter::DeleteLocalStorageInSequencedTask( - DOMStorageContext* dom_storage_context) { - DCHECK(dom_storage_context->task_runner()->RunsTasksOnCurrentThread()); - dom_storage_context->DeleteForOrigin(origin_id_); -} - void ExtensionDataDeleter::DeleteIndexedDBOnWebkitThread( scoped_refptr indexed_db_context) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED)); diff --git a/chrome/browser/extensions/extension_data_deleter.h b/chrome/browser/extensions/extension_data_deleter.h index c3ab6ce..41c781b 100644 --- a/chrome/browser/extensions/extension_data_deleter.h +++ b/chrome/browser/extensions/extension_data_deleter.h @@ -70,11 +70,6 @@ class ExtensionDataDeleter // thread. void DeleteDatabaseOnFileThread(); - // Deletes local storage for the extension. May only be called in a - // DOMStorageContext sequenced task. - void DeleteLocalStorageInSequencedTask( - content::DOMStorageContext* dom_storage_context); - // Deletes indexed db files for the extension. May only be called on the // webkit thread. void DeleteIndexedDBOnWebkitThread( -- cgit v1.1