Add access count and time-since-accessed histograms to temp storage eviction.

content/browser/quota/quota_manager_unittest.cc

 // Copyright 2014 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 <algorithm>
 #include <set>
 #include <sstream>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 1359 matching lines @@
   MockStorageClient* client =
       CreateClient(kData, arraysize(kData), QuotaClient::kFileSystem);
   RegisterClient(client);
 
   GetGlobalUsage(kTemp);
   base::RunLoop().RunUntilIdle();
 
   EvictOriginData(GURL("http://foo.com/"), kTemp);
   base::RunLoop().RunUntilIdle();
 
+  // Ensure used count and time since access are recorded.
+  histograms.ExpectTotalCount(
+      QuotaManager::kEvictedOriginAccessedCountHistogram, 1);
+  histograms.ExpectBucketCount(
+      QuotaManager::kEvictedOriginAccessedCountHistogram, 0, 1);
+  histograms.ExpectTotalCount(
+      QuotaManager::kEvictedOriginTimeSinceAccessHistogram, 1);

[michaeln, 2015/11/05 00:01:23]

ooops, wait... this test is red?

[calamity, 2015/11/05 07:10:47]

Only ran quota database tests locally after the change. Forgot to update the
QuotaManager after the return value change of GetOriginInfo. Fixed now.

+
   // First eviction has no 'last' time to compare to.
   histograms.ExpectTotalCount(
       QuotaManager::kTimeBetweenRepeatedOriginEvictionsHistogram, 0);
 
   client->AddOriginAndNotify(GURL("http://foo.com"), kTemp, 100);
 
+  // Change the used count of the origin.
+  quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown, GURL(kOrigin),
+                                         kTemp);
+  base::RunLoop().RunUntilIdle();
+
   GetGlobalUsage(kTemp);
   base::RunLoop().RunUntilIdle();
 
   EvictOriginData(GURL("http://foo.com/"), kTemp);
   base::RunLoop().RunUntilIdle();
 
-  // Second eviction should log a histogram sample.
+  // The new used count should be logged.
+  histograms.ExpectTotalCount(
+      QuotaManager::kEvictedOriginAccessedCountHistogram, 2);
+  histograms.ExpectBucketCount(
+      QuotaManager::kEvictedOriginAccessedCountHistogram, 1, 1);
+  histograms.ExpectTotalCount(
+      QuotaManager::kEvictedOriginTimeSinceAccessHistogram, 2);
+
+  // Second eviction should log a 'time between repeated eviction' sample.
   histograms.ExpectTotalCount(
       QuotaManager::kTimeBetweenRepeatedOriginEvictionsHistogram, 1);
 
   client->AddOriginAndNotify(GURL("http://foo.com"), kTemp, 100);
 
   GetGlobalUsage(kTemp);
   base::RunLoop().RunUntilIdle();
 
   DeleteOriginFromDatabase(GURL("http://foo.com"), kTemp);
 
@@ skipping 848 matching lines @@
   EXPECT_EQ(QuotaManager::kIncognitoDefaultQuotaLimit, quota());
 
   GetUsageAndQuotaForWebApps(GURL("http://foo.com/"), kTemp);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(kQuotaStatusOk, status());
   EXPECT_EQ(10, usage());
   EXPECT_EQ(QuotaManager::kIncognitoDefaultQuotaLimit, quota());
 }
 
 }  // namespace content