| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" | 5 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 10 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 InfoByOrigin& origin_map = info_collection->infos_by_origin; | 31 InfoByOrigin& origin_map = info_collection->infos_by_origin; |
| 32 for (InfoByOrigin::iterator it = origin_map.begin(); | 32 for (InfoByOrigin::iterator it = origin_map.begin(); |
| 33 it != origin_map.end();) { | 33 it != origin_map.end();) { |
| 34 if (!BrowsingDataHelper::HasWebScheme(it->first)) | 34 if (!BrowsingDataHelper::HasWebScheme(it->first)) |
| 35 origin_map.erase(it++); | 35 origin_map.erase(it++); |
| 36 else | 36 else |
| 37 ++it; | 37 ++it; |
| 38 } | 38 } |
| 39 | 39 |
| 40 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 40 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 41 base::Bind(callback, info_collection)); | 41 base::BindOnce(callback, info_collection)); |
| 42 } | 42 } |
| 43 | 43 |
| 44 } // namespace | 44 } // namespace |
| 45 | 45 |
| 46 BrowsingDataAppCacheHelper::BrowsingDataAppCacheHelper( | 46 BrowsingDataAppCacheHelper::BrowsingDataAppCacheHelper( |
| 47 BrowserContext* browser_context) | 47 BrowserContext* browser_context) |
| 48 : appcache_service_( | 48 : appcache_service_( |
| 49 BrowserContext::GetDefaultStoragePartition(browser_context) | 49 BrowserContext::GetDefaultStoragePartition(browser_context) |
| 50 ->GetAppCacheService()) {} | 50 ->GetAppCacheService()) {} |
| 51 | 51 |
| 52 void BrowsingDataAppCacheHelper::StartFetching(const FetchCallback& callback) { | 52 void BrowsingDataAppCacheHelper::StartFetching(const FetchCallback& callback) { |
| 53 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 53 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 54 DCHECK(!callback.is_null()); | 54 DCHECK(!callback.is_null()); |
| 55 | 55 |
| 56 BrowserThread::PostTask( | 56 BrowserThread::PostTask( |
| 57 BrowserThread::IO, FROM_HERE, | 57 BrowserThread::IO, FROM_HERE, |
| 58 base::Bind(&BrowsingDataAppCacheHelper::StartFetchingOnIOThread, this, | 58 base::BindOnce(&BrowsingDataAppCacheHelper::StartFetchingOnIOThread, this, |
| 59 callback)); | 59 callback)); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void BrowsingDataAppCacheHelper::DeleteAppCacheGroup(const GURL& manifest_url) { | 62 void BrowsingDataAppCacheHelper::DeleteAppCacheGroup(const GURL& manifest_url) { |
| 63 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 63 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 64 BrowserThread::PostTask( | 64 BrowserThread::PostTask( |
| 65 BrowserThread::IO, FROM_HERE, | 65 BrowserThread::IO, FROM_HERE, |
| 66 base::Bind(&BrowsingDataAppCacheHelper::DeleteAppCacheGroupOnIOThread, | 66 base::BindOnce(&BrowsingDataAppCacheHelper::DeleteAppCacheGroupOnIOThread, |
| 67 this, manifest_url)); | 67 this, manifest_url)); |
| 68 } | 68 } |
| 69 | 69 |
| 70 BrowsingDataAppCacheHelper::~BrowsingDataAppCacheHelper() {} | 70 BrowsingDataAppCacheHelper::~BrowsingDataAppCacheHelper() {} |
| 71 | 71 |
| 72 void BrowsingDataAppCacheHelper::StartFetchingOnIOThread( | 72 void BrowsingDataAppCacheHelper::StartFetchingOnIOThread( |
| 73 const FetchCallback& callback) { | 73 const FetchCallback& callback) { |
| 74 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 74 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 75 DCHECK(!callback.is_null()); | 75 DCHECK(!callback.is_null()); |
| 76 | 76 |
| 77 scoped_refptr<content::AppCacheInfoCollection> info_collection = | 77 scoped_refptr<content::AppCacheInfoCollection> info_collection = |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 completion_callback.Run(info_collection_); | 139 completion_callback.Run(info_collection_); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void CannedBrowsingDataAppCacheHelper::DeleteAppCacheGroup( | 142 void CannedBrowsingDataAppCacheHelper::DeleteAppCacheGroup( |
| 143 const GURL& manifest_url) { | 143 const GURL& manifest_url) { |
| 144 info_collection_->infos_by_origin.erase(manifest_url.GetOrigin()); | 144 info_collection_->infos_by_origin.erase(manifest_url.GetOrigin()); |
| 145 BrowsingDataAppCacheHelper::DeleteAppCacheGroup(manifest_url); | 145 BrowsingDataAppCacheHelper::DeleteAppCacheGroup(manifest_url); |
| 146 } | 146 } |
| 147 | 147 |
| 148 CannedBrowsingDataAppCacheHelper::~CannedBrowsingDataAppCacheHelper() {} | 148 CannedBrowsingDataAppCacheHelper::~CannedBrowsingDataAppCacheHelper() {} |
| OLD | NEW |