Refactor cache counting into a separate helper class

chrome/browser/ui/webui/settings/chromeos/device_storage_handler.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
 
 #include <algorithm>
 #include <numeric>
 #include <string>
 
@@ skipping 10 matching lines @@
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_service_worker_helper.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/cryptohome/homedir_methods.h"
-#include "components/browsing_data/content/storage_partition_http_cache_data_remover.h"
+#include "components/browsing_data/content/conditional_cache_counting_helper.h"
 #include "components/drive/chromeos/file_system_interface.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace chromeos {
 namespace settings {
@@ skipping 183 matching lines @@
 
 void StorageHandler::UpdateBrowsingDataSize() {
   if (updating_browsing_data_size_)
     return;
   updating_browsing_data_size_ = true;
 
   has_browser_cache_size_ = false;
   has_browser_site_data_size_ = false;
   Profile* const profile = Profile::FromWebUI(web_ui());
   // Fetch the size of http cache in browsing data.
-  // StoragePartitionHttpCacheDataRemover deletes itself when it is done.
-  browsing_data::StoragePartitionHttpCacheDataRemover::CreateForRange(
+  // ConditionalCacheCountingHelper deletes itself when it is done.
+  browsing_data::ConditionalCacheCountingHelper::CreateForRange(
       content::BrowserContext::GetDefaultStoragePartition(profile),
-      base::Time(),
-      base::Time::Max())->Count(
+      base::Time(), base::Time::Max())
+      ->CountAndDestroySelfWhenFinished(
           base::Bind(&StorageHandler::OnGetBrowsingDataSize,
                      base::Unretained(this), false));
 
   // Fetch the size of site data in browsing data.
   if (!site_data_size_collector_.get()) {
     content::StoragePartition* storage_partition =
         content::BrowserContext::GetDefaultStoragePartition(profile);
     site_data_size_collector_.reset(new SiteDataSizeCollector(
         storage_partition->GetPath(),
         new BrowsingDataCookieHelper(profile->GetRequestContext()),
@@ skipping 129 matching lines @@
                          base::StringValue("storage-android-size-changed"),
                          base::StringValue(size_string));
 }
 
 void StorageHandler::OnClearDriveCacheDone(bool success) {
   UpdateDriveCacheSize();
 }
 
 }  // namespace settings
 }  // namespace chromeos