[Offline Pages] Add cached offline page utils and show usage in settings.

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 d131033608d252204bd70105a4bd5a213afe24b4..b448bb6a6d6aff1a2c5f4cfb1a01853e5e1a0832 100644
--- a/chrome/browser/browsing_data/cache_counter.cc
+++ b/chrome/browser/browsing_data/cache_counter.cc
@@ -9,6 +9,10 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/offline_pages/offline_page_utils.h"
+#endif  // OS_ANDROID
+
 CacheCounter::CacheResult::CacheResult(const CacheCounter* source,
                                        int64_t cache_size,
                                        bool is_upper_limit)
@@ -32,8 +36,11 @@ const char* CacheCounter::GetPrefName() const {
 }
 
 void CacheCounter::Count() {
-  // Cancel existing requests.
+  // Cancel existing requests and reset states.
   weak_ptr_factory_.InvalidateWeakPtrs();
+  calculated_size_ = 0;
+  is_upper_limit_ = false;
+  pending_sources_ = 1;
   base::WeakPtr<browsing_data::ConditionalCacheCountingHelper> counter =
       browsing_data::ConditionalCacheCountingHelper::CreateForRange(
           content::BrowserContext::GetDefaultStoragePartition(profile_),
@@ -41,14 +48,30 @@ void CacheCounter::Count() {
           ->CountAndDestroySelfWhenFinished(
               base::Bind(&CacheCounter::OnCacheSizeCalculated,
                          weak_ptr_factory_.GetWeakPtr()));
+#if defined(OS_ANDROID)
+  if (offline_pages::OfflinePageUtils::GetCachedOfflinePageSizeBetween(
+          profile_,
+          base::Bind(&CacheCounter::OnCacheSizeCalculated,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     false /* is_upper_limit */),
+          GetPeriodStart(), base::Time::Max())) {
+    pending_sources_++;
+  }
+#endif  // OS_ANDROID
 }
 
-void CacheCounter::OnCacheSizeCalculated(int64_t result_bytes,
-                                         bool is_upper_limit) {
+void CacheCounter::OnCacheSizeCalculated(bool is_upper_limit,
+                                         int64_t cache_bytes) {
   // A value less than 0 means a net error code.

[dewittj, 2017/05/11 16:58:43]

nit: add a DCHECK(pending_sources_ > 0)

-  if (result_bytes < 0)
+  if (cache_bytes < 0)
     return;
-  auto result =
-      base::MakeUnique<CacheResult>(this, result_bytes, is_upper_limit);
-  ReportResult(std::move(result));
+
+  pending_sources_--;
+  calculated_size_ += cache_bytes;
+  is_upper_limit_ = is_upper_limit_ || is_upper_limit;

[dullweber, 2017/05/10 08:13:40]

you could use |= here

[romax, 2017/05/12 00:44:37]

Done.

[msramek, 2017/05/12 09:31:27]

I have a vague memory that using bitwise OR with logical values might be against
the style guide, but I can't find it. But it should work correctly in C++, and
disjunction in particular would work correctly even with ints, so I guess we can
leave it as is.

+  if (pending_sources_ == 0) {
+    auto result =
+        base::MakeUnique<CacheResult>(this, calculated_size_, is_upper_limit_);
+    ReportResult(std::move(result));
+  }
 }