Refactor cache counting into a separate helper class

chrome/browser/browsing_data/cache_counter.cc

Index: chrome/browser/browsing_data/cache_counter.cc
diff --git a/chrome/browser/browsing_data/cache_counter.cc b/chrome/browser/browsing_data/cache_counter.cc
index 5a5890c84e1a63762c628f60274c7900425b7777..0743db3d246a3bbf839120f7cd52de200a7384cb 100644
--- a/chrome/browser/browsing_data/cache_counter.cc
+++ b/chrome/browser/browsing_data/cache_counter.cc
@@ -4,13 +4,28 @@
 
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/profiles/profile.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/browsing_data/core/pref_names.h"
+#include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 
+namespace {
+base::TimeDelta kDefaultCacheCounterTimeout = base::TimeDelta::FromSeconds(3);
+}
+
+CacheCounter::CacheResult::CacheResult(const CacheCounter* source,
+                                       int64_t cache_size,
+                                       bool is_upper_limit)
+    : FinishedResult(source, cache_size),
+      cache_size_(cache_size),
+      is_upper_limit_(is_upper_limit) {}
+
+CacheCounter::CacheResult::~CacheResult() {}
+
 CacheCounter::CacheCounter(Profile* profile)
     : profile_(profile),
       pending_(false),
+      timeout_(kDefaultCacheCounterTimeout),
       weak_ptr_factory_(this) {}
 
 CacheCounter::~CacheCounter() {
@@ -21,27 +36,58 @@ const char* CacheCounter::GetPrefName() const {
 }
 
 void CacheCounter::Count() {
-  // TODO(msramek): StoragePartitionHttpCacheDataRemover currently does not
-  // implement counting for subsets of cache, only for the entire cache. Thus,
-  // we ignore the time period setting and always request counting for
-  // the unbounded time interval. It is up to the UI to interpret the results
-  // for finite time intervals as upper estimates.
-  browsing_data::StoragePartitionHttpCacheDataRemover::CreateForRange(
+  base::WeakPtr<browsing_data::ConditionalCacheCountingHelper> counter =
+      browsing_data::ConditionalCacheCountingHelper::CreateForRange(
+          content::BrowserContext::GetDefaultStoragePartition(profile_),
+          GetPeriodStart(), base::Time::Max())
+          ->CountAndDestroySelfWhenFinished(
+              base::Bind(&CacheCounter::OnCacheSizeCalculated,
+                         weak_ptr_factory_.GetWeakPtr(), false));
+  // Counting a subset of the cache can take a long time. If it doesn't succeed
+  // before |cache_counter_timeout| runs out, get the total cache size as an
+  // estimate instead. We don't need a timeout if GetPeriodStart() is null as
+  // this already retrieves the full cache size.
+  if (!GetPeriodStart().is_null()) {
+    content::BrowserThread::PostDelayedTask(
+        content::BrowserThread::UI, FROM_HERE,
+        base::Bind(&CacheCounter::FetchEstimate, weak_ptr_factory_.GetWeakPtr(),
+                   counter),
+        timeout_);
+  }
+  pending_ = true;
+}
+
+void CacheCounter::FetchEstimate(
+    base::WeakPtr<browsing_data::ConditionalCacheCountingHelper> counter) {
+  if (!counter || counter->IsFinished())
+    return;
+  counter->CancelCounting();
+  // Try again for the whole cache.
+  browsing_data::ConditionalCacheCountingHelper::CreateForRange(
       content::BrowserContext::GetDefaultStoragePartition(profile_),
       base::Time(), base::Time::Max())
-      ->Count(base::Bind(&CacheCounter::OnCacheSizeCalculated,
-                         weak_ptr_factory_.GetWeakPtr()));
-  pending_ = true;
+      ->CountAndDestroySelfWhenFinished(
+          base::Bind(&CacheCounter::OnCacheSizeCalculated,
+                     weak_ptr_factory_.GetWeakPtr(), true));
+}
+
+void CacheCounter::SetTimeout(base::TimeDelta timeout) {
+  timeout_ = timeout;
 }
 
-void CacheCounter::OnCacheSizeCalculated(int64_t result_bytes) {
+void CacheCounter::OnCacheSizeCalculated(bool is_upper_limit,
+                                         int64_t result_bytes) {
+  if (result_bytes == net::ERR_ABORTED) {
+    return;
+  }
   pending_ = false;
 
   // A value less than 0 means a net error code.
   if (result_bytes < 0)
     return;
-
-  ReportResult(result_bytes);
+  auto result =
+      base::MakeUnique<CacheResult>(this, result_bytes, is_upper_limit);
+  ReportResult(std::move(result));
 }
 
 bool CacheCounter::Pending() {