Show the exact cache size for time ranges if supported

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 219 matching lines @@
 
   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.
   // ConditionalCacheCountingHelper deletes itself when it is done.
   browsing_data::ConditionalCacheCountingHelper::CreateForRange(
       content::BrowserContext::GetDefaultStoragePartition(profile),
       base::Time(), base::Time::Max())
       ->CountAndDestroySelfWhenFinished(
-          base::Bind(&StorageHandler::OnGetBrowsingDataSize,
-                     base::Unretained(this), false));
+          base::Bind(&StorageHandler::OnGetCacheSize, base::Unretained(this)));
 
   // 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()),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         new BrowsingDataAppCacheHelper(profile),
         new BrowsingDataIndexedDBHelper(
             storage_partition->GetIndexedDBContext()),
         BrowsingDataFileSystemHelper::Create(
             storage_partition->GetFileSystemContext()),
         BrowsingDataChannelIDHelper::Create(profile->GetRequestContext()),
         new BrowsingDataServiceWorkerHelper(
             storage_partition->GetServiceWorkerContext()),
         new BrowsingDataCacheStorageHelper(
             storage_partition->GetCacheStorageContext()),
         BrowsingDataFlashLSOHelper::Create(profile)));
   }
   site_data_size_collector_->Fetch(
       base::Bind(&StorageHandler::OnGetBrowsingDataSize,
                  base::Unretained(this), true));
 }
 
+void StorageHandler::OnGetCacheSize(int64_t size, bool is_upper_limit) {
+  DCHECK(!is_upper_limit);
+  OnGetBrowsingDataSize(false, size);
+}
+
 void StorageHandler::OnGetBrowsingDataSize(bool is_site_data, int64_t size) {
   if (is_site_data) {
     has_browser_site_data_size_ = true;
     browser_site_data_size_ = size;
   } else {
     has_browser_cache_size_ = true;
     browser_cache_size_ = size;
   }
   if (has_browser_cache_size_ && has_browser_site_data_size_) {
     base::string16 size_string;
@@ skipping 100 matching lines @@
                          base::StringValue("storage-android-size-changed"),
                          base::StringValue(size_string));
 }
 
 void StorageHandler::OnClearDriveCacheDone(bool success) {
   UpdateDriveCacheSize();
 }
 
 }  // namespace settings
 }  // namespace chromeos