Add Quota.TimeSinceOriginEvicted UMA histogram.

content/browser/quota/quota_database_unittest.cc

Index: content/browser/quota/quota_database_unittest.cc
diff --git a/content/browser/quota/quota_database_unittest.cc b/content/browser/quota/quota_database_unittest.cc
index 84af01707c26e7af10a991cb39ec72296bc736c1..4bfdd8b51b796fdb1333e39e34f4f7ab8e554153 100644
--- a/content/browser/quota/quota_database_unittest.cc
+++ b/content/browser/quota/quota_database_unittest.cc
@@ -56,7 +56,7 @@ class QuotaDatabaseTest : public testing::Test {
     EXPECT_TRUE(kDbFile.empty() || base::PathExists(kDbFile));
   }
 
-  void UpgradeSchemaV2toV3(const base::FilePath& kDbFile) {
+  void UpgradeSchemaV2toV5(const base::FilePath& kDbFile) {
     const QuotaTableEntry entries[] = {
       QuotaTableEntry("a", kStorageTypeTemporary,  1),
       QuotaTableEntry("b", kStorageTypeTemporary,  2),
@@ -74,6 +74,9 @@ class QuotaDatabaseTest : public testing::Test {
     EXPECT_TRUE(db.DumpQuotaTable(
         base::Bind(&Verifier::Run, base::Unretained(&verifier))));
     EXPECT_TRUE(verifier.table.empty());
+
+    EXPECT_TRUE(db.db_->DoesTableExist("EvictionInfoTable"));
+    EXPECT_TRUE(db.db_->DoesIndexExist("sqlite_autoindex_EvictionInfoTable_1"));
   }
 
   void HostQuota(const base::FilePath& kDbFile) {
@@ -294,6 +297,61 @@ class QuotaDatabaseTest : public testing::Test {
     EXPECT_EQ(0U, origins.count(kOrigin3));
   }
 
+  void OriginLastEvicted(const base::FilePath& kDbFile) {
+    QuotaDatabase db(kDbFile);
+    ASSERT_TRUE(db.LazyOpen(true));
+
+    const GURL kOrigin1("http://a/");
+    const GURL kOrigin2("http://b/");
+    const GURL kOrigin3("http://c/");
+
+    base::Time last_eviction_time;
+    EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin1, kStorageTypeTemporary,
+                                             &last_eviction_time));
+    EXPECT_EQ(base::Time(), last_eviction_time);
+
+    // Report last eviction time for the test origins.
+    EXPECT_TRUE(db.SetOriginLastEvictionTime(
+        kOrigin1, kStorageTypeTemporary, base::Time::FromInternalValue(10)));
+    EXPECT_TRUE(db.SetOriginLastEvictionTime(
+        kOrigin2, kStorageTypeTemporary, base::Time::FromInternalValue(20)));
+    EXPECT_TRUE(db.SetOriginLastEvictionTime(
+        kOrigin3, kStorageTypeTemporary, base::Time::FromInternalValue(30)));
+
+    EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin1, kStorageTypeTemporary,
+                                             &last_eviction_time));
+    EXPECT_EQ(base::Time::FromInternalValue(10), last_eviction_time);
+    EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin2, kStorageTypeTemporary,
+                                             &last_eviction_time));
+    EXPECT_EQ(base::Time::FromInternalValue(20), last_eviction_time);
+    EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin3, kStorageTypeTemporary,
+                                             &last_eviction_time));
+    EXPECT_EQ(base::Time::FromInternalValue(30), last_eviction_time);
+
+    // Delete last eviction times for the test origins.
+    EXPECT_TRUE(
+        db.DeleteOriginLastEvictionTime(kOrigin1, kStorageTypeTemporary));
+    EXPECT_TRUE(
+        db.DeleteOriginLastEvictionTime(kOrigin2, kStorageTypeTemporary));
+    EXPECT_TRUE(
+        db.DeleteOriginLastEvictionTime(kOrigin3, kStorageTypeTemporary));
+
+    last_eviction_time = base::Time();
+    EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin1, kStorageTypeTemporary,
+                                             &last_eviction_time));
+    EXPECT_EQ(base::Time(), last_eviction_time);
+    EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin2, kStorageTypeTemporary,
+                                             &last_eviction_time));
+    EXPECT_EQ(base::Time(), last_eviction_time);
+    EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin3, kStorageTypeTemporary,
+                                             &last_eviction_time));
+    EXPECT_EQ(base::Time(), last_eviction_time);
+
+    // Deleting an origin that is not present should not fail.
+    EXPECT_TRUE(db.DeleteOriginLastEvictionTime(GURL("http://notpresent.com"),
+                                                kStorageTypeTemporary));
+  }
+
   void RegisterInitialOriginInfo(const base::FilePath& kDbFile) {
     QuotaDatabase db(kDbFile);
 
@@ -506,7 +564,7 @@ TEST_F(QuotaDatabaseTest, UpgradeSchema) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
   const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
-  UpgradeSchemaV2toV3(kDbFile);
+  UpgradeSchemaV2toV5(kDbFile);
 }
 
 TEST_F(QuotaDatabaseTest, HostQuota) {
@@ -541,6 +599,14 @@ TEST_F(QuotaDatabaseTest, OriginLastModifiedSince) {
   OriginLastModifiedSince(base::FilePath());
 }
 
+TEST_F(QuotaDatabaseTest, OriginLastEvicted) {
+  base::ScopedTempDir data_dir;
+  ASSERT_TRUE(data_dir.CreateUniqueTempDir());
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
+  OriginLastEvicted(kDbFile);
+  OriginLastEvicted(base::FilePath());
+}
+
 TEST_F(QuotaDatabaseTest, BootstrapFlag) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());