diff options
author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 01:22:24 +0000 |
---|---|---|
committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 01:22:24 +0000 |
commit | 73fb95700def0d35ac034a50c8039635f103377f (patch) | |
tree | ba155b89b20c8c8fbe4a1c9d4b6b53ab34812f93 /chrome/browser/browsing_data_database_helper.cc | |
parent | 9722cfd1629cc0ecaf0fc4f7f10174ded220afe5 (diff) | |
download | chromium_src-73fb95700def0d35ac034a50c8039635f103377f.zip chromium_src-73fb95700def0d35ac034a50c8039635f103377f.tar.gz chromium_src-73fb95700def0d35ac034a50c8039635f103377f.tar.bz2 |
Use the DatabaseTracker only on the FILE thread.
TEST=none
BUG=81916
Review URL: http://codereview.chromium.org/7046013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_database_helper.cc')
-rw-r--r-- | chrome/browser/browsing_data_database_helper.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc index 1486b5a..437f5e9 100644 --- a/chrome/browser/browsing_data_database_helper.cc +++ b/chrome/browser/browsing_data_database_helper.cc @@ -63,8 +63,8 @@ void BrowsingDataDatabaseHelper::StartFetching( is_fetching_ = true; database_info_.clear(); completion_callback_.reset(callback); - BrowserThread::PostTask(BrowserThread::WEBKIT, FROM_HERE, NewRunnableMethod( - this, &BrowsingDataDatabaseHelper::FetchDatabaseInfoInWebKitThread)); + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod( + this, &BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread)); } void BrowsingDataDatabaseHelper::CancelNotification() { @@ -75,13 +75,13 @@ void BrowsingDataDatabaseHelper::CancelNotification() { void BrowsingDataDatabaseHelper::DeleteDatabase(const std::string& origin, const std::string& name) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - BrowserThread::PostTask(BrowserThread::WEBKIT, FROM_HERE, NewRunnableMethod( - this, &BrowsingDataDatabaseHelper::DeleteDatabaseInWebKitThread, origin, + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod( + this, &BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread, origin, name)); } -void BrowsingDataDatabaseHelper::FetchDatabaseInfoInWebKitThread() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT)); +void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); std::vector<webkit_database::OriginInfo> origins_info; if (tracker_.get() && tracker_->GetAllOriginsInfo(&origins_info)) { for (std::vector<webkit_database::OriginInfo>::const_iterator ori = @@ -133,10 +133,10 @@ void BrowsingDataDatabaseHelper::NotifyInUIThread() { database_info_.clear(); } -void BrowsingDataDatabaseHelper::DeleteDatabaseInWebKitThread( +void BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread( const std::string& origin, const std::string& name) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (!tracker_.get()) return; tracker_->DeleteDatabase(UTF8ToUTF16(origin), UTF8ToUTF16(name), NULL); |