Refactor cache counting into a separate helper class

chrome/browser/browsing_data/browsing_data_counter_utils.cc

 // Copyright 2015 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/browsing_data/browsing_data_counter_utils.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/media_licenses_counter.h"
@@ skipping 45 matching lines @@
     const browsing_data::BrowsingDataCounter::Result* result) {
   std::string pref_name = result->source()->GetPrefName();
 
   if (!result->Finished()) {
     // The counter is still counting.
     return l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_CALCULATING);
   }
 
   if (pref_name == browsing_data::prefs::kDeleteCache) {
     // Cache counter.
-    browsing_data::BrowsingDataCounter::ResultInt cache_size_bytes =
-        static_cast<const browsing_data::BrowsingDataCounter::FinishedResult*>(
-            result)
-            ->Value();
-
-    PrefService* prefs = result->source()->GetPrefs();
-    browsing_data::TimePeriod time_period =
-        static_cast<browsing_data::TimePeriod>(
-            prefs->GetInteger(browsing_data::prefs::kDeleteTimePeriod));
+    const auto* cache_result =
+        static_cast<const CacheCounter::CacheResult*>(result);
+    int64_t cache_size_bytes = cache_result->cache_size();
+    bool is_upper_limit = cache_result->is_upper_limit();
 
     // Three cases: Nonzero result for the entire cache, nonzero result for
     // a subset of cache (i.e. a finite time interval), and almost zero (< 1MB).
     static const int kBytesInAMegabyte = 1024 * 1024;
     if (cache_size_bytes >= kBytesInAMegabyte) {
       base::string16 formatted_size = FormatBytesMBOrHigher(cache_size_bytes);
-      return time_period == browsing_data::ALL_TIME
+      return !is_upper_limit
                  ? formatted_size
                  : l10n_util::GetStringFUTF16(
                        IDS_DEL_CACHE_COUNTER_UPPER_ESTIMATE, formatted_size);
     }
     return l10n_util::GetStringUTF16(IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY);
   }
 
   if (pref_name == browsing_data::prefs::kDeleteMediaLicenses) {
     const MediaLicensesCounter::MediaLicenseResult* media_license_result =
         static_cast<const MediaLicensesCounter::MediaLicenseResult*>(result);
@@ skipping 38 matching lines @@
     return base::ReplaceStringPlaceholders(
         l10n_util::GetPluralStringFUTF16(
             IDS_DEL_HOSTED_APPS_COUNTER, hosted_apps_count),
         replacements,
         nullptr);
   }
 #endif
 
   return browsing_data::GetCounterTextFromResult(result);
 }