| Index: chrome/browser/browsing_data/local_data_container.cc
|
| diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
|
| index fc82df8868e7ab55bd8233d0420dc5ea0fd565e5..8e9f633a5298f04db606d572d2cdde2bf1555f65 100644
|
| --- a/chrome/browser/browsing_data/local_data_container.cc
|
| +++ b/chrome/browser/browsing_data/local_data_container.cc
|
| @@ -25,6 +25,7 @@ LocalDataContainer::LocalDataContainer(
|
| BrowsingDataQuotaHelper* quota_helper,
|
| BrowsingDataChannelIDHelper* channel_id_helper,
|
| BrowsingDataServiceWorkerHelper* service_worker_helper,
|
| + BrowsingDataCacheStorageHelper* cache_storage_helper,
|
| BrowsingDataFlashLSOHelper* flash_lso_helper)
|
| : appcache_helper_(appcache_helper),
|
| cookie_helper_(cookie_helper),
|
| @@ -36,11 +37,11 @@ LocalDataContainer::LocalDataContainer(
|
| quota_helper_(quota_helper),
|
| channel_id_helper_(channel_id_helper),
|
| service_worker_helper_(service_worker_helper),
|
| + cache_storage_helper_(cache_storage_helper),
|
| flash_lso_helper_(flash_lso_helper),
|
| model_(NULL),
|
| batches_started_(0),
|
| - weak_ptr_factory_(this) {
|
| -}
|
| + weak_ptr_factory_(this) {}
|
|
|
| LocalDataContainer::~LocalDataContainer() {}
|
|
|
| @@ -119,6 +120,13 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
|
| weak_ptr_factory_.GetWeakPtr()));
|
| }
|
|
|
| + if (cache_storage_helper_.get()) {
|
| + batches_started_++;
|
| + cache_storage_helper_->StartFetching(
|
| + base::Bind(&LocalDataContainer::OnCacheStorageModelInfoLoaded,
|
| + weak_ptr_factory_.GetWeakPtr()));
|
| + }
|
| +
|
| if (flash_lso_helper_.get()) {
|
| batches_started_++;
|
| flash_lso_helper_->StartFetching(
|
| @@ -219,6 +227,13 @@ void LocalDataContainer::OnServiceWorkerModelInfoLoaded(
|
| model_->PopulateServiceWorkerUsageInfo(this);
|
| }
|
|
|
| +void LocalDataContainer::OnCacheStorageModelInfoLoaded(
|
| + const CacheStorageUsageInfoList& cache_storage_info) {
|
| + cache_storage_info_list_ = cache_storage_info;
|
| + DCHECK(model_);
|
| + model_->PopulateCacheStorageUsageInfo(this);
|
| +}
|
| +
|
| void LocalDataContainer::OnFlashLSOInfoLoaded(
|
| const FlashLSODomainList& domains) {
|
| flash_lso_domain_list_ = domains;
|
|
|