Add Quota.TimeSinceOriginEvicted UMA histogram.

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"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/sys_info.h"
+#include "base/test/histogram_tester.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "content/public/test/mock_special_storage_policy.h"
 #include "content/public/test/mock_storage_client.h"
 #include "storage/browser/quota/quota_database.h"
 #include "storage/browser/quota/quota_manager.h"
 #include "storage/browser/quota/quota_manager_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ skipping 256 matching lines @@
 
   void NotifyStorageAccessed(QuotaClient* client,
                              const GURL& origin,
                              StorageType type) {
     DCHECK(client);
     quota_manager_->NotifyStorageAccessedInternal(
         client->id(), origin, type, IncrementMockTime());
   }
 
   void DeleteOriginFromDatabase(const GURL& origin, StorageType type) {
-    quota_manager_->DeleteOriginFromDatabase(origin, type);
+    quota_manager_->DeleteOriginFromDatabase(origin, type, false);
   }
 
   void GetEvictionOrigin(StorageType type) {
     eviction_origin_ = GURL();
     // The quota manager's default eviction policy is to use an LRU eviction
     // policy.
     quota_manager_->GetEvictionOrigin(
         type, 0, base::Bind(&QuotaManagerTest::DidGetEvictionOrigin,
                             weak_factory_.GetWeakPtr()));
   }
@@ skipping 1046 matching lines @@
 
   GetHostUsage("foo.com", kTemp);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(predelete_host_tmp - (1 + 50000), usage());
 
   GetHostUsage("foo.com", kPerm);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(predelete_host_pers, usage());
 }
 
+TEST_F(QuotaManagerTest, EvictOriginDataHistogram) {
+  const GURL kOrigin = GURL("http://foo.com");
+  static const MockOriginData kData[] = {
+      {"http://foo.com/", kTemp, 1},
+  };
+
+  base::HistogramTester histograms;
+  MockStorageClient* client =
+      CreateClient(kData, arraysize(kData), QuotaClient::kFileSystem);
+  RegisterClient(client);
+
+  GetGlobalUsage(kTemp);
+  base::RunLoop().RunUntilIdle();
+
+  EvictOriginData(GURL("http://foo.com/"), kTemp);
+  base::RunLoop().RunUntilIdle();
+
+  // First eviction has no 'last' time to compare to.
+  histograms.ExpectTotalCount(
+      QuotaManager::kTimeBetweenRepeatedOriginEvictionsHistogram, 0);
+
+  client->AddOriginAndNotify(GURL("http://foo.com"), kTemp, 100);
+
+  GetGlobalUsage(kTemp);
+  base::RunLoop().RunUntilIdle();
+
+  EvictOriginData(GURL("http://foo.com/"), kTemp);
+  base::RunLoop().RunUntilIdle();
+
+  // Second eviction should log a histogram 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);
+
+  // Deletion from non-eviction source should not log a histogram sample.
+  histograms.ExpectTotalCount(
+      QuotaManager::kTimeBetweenRepeatedOriginEvictionsHistogram, 1);
+}
+
 TEST_F(QuotaManagerTest, EvictOriginDataWithDeletionError) {
   static const MockOriginData kData[] = {
     { "http://foo.com/",   kTemp,       1 },
     { "http://foo.com:1/", kTemp,      20 },
     { "http://foo.com/",   kPerm,     300 },
     { "http://bar.com/",   kTemp,    4000 },
   };
   static const int kNumberOfTemporaryOrigins = 3;
   MockStorageClient* client = CreateClient(kData, arraysize(kData),
       QuotaClient::kFileSystem);
@@ skipping 833 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