diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 23:35:44 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 23:35:44 +0000 |
| commit | 3f2f5f05a2a9afe503e0c4e13a8dad87ab214b14 (patch) | |
| tree | 1177d24b6ca5f81de4a0d0ae0b748cd596d5beaf /chrome/browser/browsing_data_appcache_helper.cc | |
| parent | d2981f38a23525812f2030cf68a5ef6259e30fb7 (diff) | |
| download | chromium_src-3f2f5f05a2a9afe503e0c4e13a8dad87ab214b14.zip chromium_src-3f2f5f05a2a9afe503e0c4e13a8dad87ab214b14.tar.gz chromium_src-3f2f5f05a2a9afe503e0c4e13a8dad87ab214b14.tar.bz2 | |
Use WeakPtrFactory in CookieTreeModel instead of explicit cancellation on destruction.
BUG=121863
TEST=trybots
Review URL: https://chromiumcodereview.appspot.com/9968112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_appcache_helper.cc')
| -rw-r--r-- | chrome/browser/browsing_data_appcache_helper.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc index 7417a19..a16ff02 100644 --- a/chrome/browser/browsing_data_appcache_helper.cc +++ b/chrome/browser/browsing_data_appcache_helper.cc @@ -45,18 +45,6 @@ void BrowsingDataAppCacheHelper::StartFetching(const base::Closure& callback) { GetAllAppCacheInfo(info_collection_, appcache_info_callback_.callback()); } -void BrowsingDataAppCacheHelper::CancelNotification() { - if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { - completion_callback_.Reset(); - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::Bind(&BrowsingDataAppCacheHelper::CancelNotification, this)); - return; - } - - appcache_info_callback_.Cancel(); -} - void BrowsingDataAppCacheHelper::DeleteAppCacheGroup( const GURL& manifest_url) { if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { @@ -96,10 +84,8 @@ void BrowsingDataAppCacheHelper::OnFetchComplete(int rv) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(is_fetching_); is_fetching_ = false; - if (!completion_callback_.is_null()) { - completion_callback_.Run(); - completion_callback_.Reset(); - } + completion_callback_.Run(); + completion_callback_.Reset(); } CannedBrowsingDataAppCacheHelper::CannedBrowsingDataAppCacheHelper( |