Show the exact cache size for time ranges if supported

chrome/browser/browsing_data/conditional_cache_counting_helper_browsertest.cc

Index: chrome/browser/browsing_data/conditional_cache_counting_helper_browsertest.cc
diff --git a/chrome/browser/browsing_data/conditional_cache_counting_helper_browsertest.cc b/chrome/browser/browsing_data/conditional_cache_counting_helper_browsertest.cc
index 9dc94e417be6e8de2c29824708c6ed6a2b5631cd..24eb59baca6005ce2533ef897bfbab12b6bf3377 100644
--- a/chrome/browser/browsing_data/conditional_cache_counting_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/conditional_cache_counting_helper_browsertest.cc
@@ -21,7 +21,7 @@ using content::BrowserThread;
 
 class ConditionalCacheCountingHelperBrowserTest : public InProcessBrowserTest {
  public:
-  const int64_t kTimeoutMs = 10;
+  const int64_t kTimeoutMs = 1000;
 
   void SetUpOnMainThread() override {
     count_callback_ =
@@ -35,11 +35,12 @@ class ConditionalCacheCountingHelperBrowserTest : public InProcessBrowserTest {
 
   void TearDownOnMainThread() override { cache_util_.reset(); }
 
-  void CountCallback(int64_t size) {
+  void CountCallback(int64_t size, bool is_upper_limit) {
     // Negative values represent an unexpected error.
     DCHECK(size >= 0 || size == net::ERR_ABORTED);
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     last_size_ = size;
+    last_is_upper_limit_ = is_upper_limit;
 
     if (run_loop_)
       run_loop_->Quit();
@@ -64,6 +65,8 @@ class ConditionalCacheCountingHelperBrowserTest : public InProcessBrowserTest {
     return last_size_;
   }
 
+  int64_t IsUpperLimit() { return last_is_upper_limit_; }
+
   int64_t GetResultOrError() { return last_size_; }
 
   CacheTestUtil* GetCacheTestUtil() { return cache_util_.get(); }
@@ -74,6 +77,7 @@ class ConditionalCacheCountingHelperBrowserTest : public InProcessBrowserTest {
   std::unique_ptr<CacheTestUtil> cache_util_;
 
   int64_t last_size_;
+  bool last_is_upper_limit_;
 };
 
 // Tests that ConditionalCacheCountingHelper only counts those cache entries
@@ -86,7 +90,8 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheCountingHelperBrowserTest, Count) {
   GetCacheTestUtil()->CreateCacheEntries(keys1);
 
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(kTimeoutMs));
-  // base::Time t2 = base::Time::Now();
+  base::Time t2 = base::Time::Now();
+  base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(kTimeoutMs));

[msramek, 2017/01/12 14:44:07]

nit: This Sleep() is here because of |t3|? Then please move |t3| right behind
this line so that it's obvious.

[dullweber, 2017/01/12 15:03:42]

The issue is that DoomEntriesBetween on the SimpleBackend adds 1 second   before
and after the time interval. I copied this behavior for the counter to have it
consistent. So if I only want to get the entries between t1 and t2 I need 1
second after t2. When I only want to get entries between t2 and t3 I need 1
second before t2.

 
   std::set<std::string> keys2 = {"6", "7"};
   GetCacheTestUtil()->CreateCacheEntries(keys2);
@@ -94,8 +99,6 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheCountingHelperBrowserTest, Count) {
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(kTimeoutMs));
   base::Time t3 = base::Time::Now();
 
-  // TODO(dullweber): Add test for time ranges when GetEntrySize() is done.
-
   // Count all entries.
   CountEntries(t1, t3);
   WaitForTasksOnIOThread();
@@ -105,4 +108,25 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheCountingHelperBrowserTest, Count) {
   CountEntries(base::Time(), base::Time::Max());
   WaitForTasksOnIOThread();
   EXPECT_EQ(size_1_3, GetResult());
+
+  // Count the size of the first set of entries.
+  CountEntries(t1, t2);
+  WaitForTasksOnIOThread();
+  int64_t size_1_2 = GetResult();
+
+  // Count the size of the second set of entries.
+  CountEntries(t2, t3);
+  WaitForTasksOnIOThread();
+  int64_t size_2_3 = GetResult();
+
+  if (IsUpperLimit()) {
+    EXPECT_EQ(size_1_2, size_1_3);
+    EXPECT_EQ(size_2_3, size_1_3);
+  } else {
+    EXPECT_GT(size_1_2, 0);
+    EXPECT_GT(size_2_3, 0);
+    EXPECT_LT(size_1_2, size_1_3);
+    EXPECT_LT(size_2_3, size_1_3);
+    EXPECT_EQ(size_1_2 + size_2_3, size_1_3);
+  }
 }