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

content/browser/quota/quota_database_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 <iterator>
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 427 matching lines @@
     AssignOriginInfoTable(db.db_.get(), begin, end);
     db.Commit();
 
     typedef EntryVerifier<Entry> Verifier;
     Verifier verifier(begin, end);
     EXPECT_TRUE(db.DumpOriginInfoTable(
         base::Bind(&Verifier::Run, base::Unretained(&verifier))));
     EXPECT_TRUE(verifier.table.empty());
   }
 
+  void GetOriginInfo(const base::FilePath& kDbFile) {
+    const GURL kOrigin = GURL("http://go/");
+    typedef QuotaDatabase::OriginInfoTableEntry Entry;
+    Entry kTableEntries[] = {
+      Entry(kOrigin, kStorageTypeTemporary, 100, base::Time(), base::Time())
+    };
+    Entry* begin = kTableEntries;
+    Entry* end = kTableEntries + arraysize(kTableEntries);
+
+    QuotaDatabase db(kDbFile);
+    EXPECT_TRUE(db.LazyOpen(true));
+    AssignOriginInfoTable(db.db_.get(), begin, end);
+    db.Commit();
+
+    Entry entry;
+    EXPECT_TRUE(db.GetOriginInfo(kOrigin, kStorageTypeTemporary, &entry));
+    EXPECT_EQ(kTableEntries[0].type, entry.type);
+    EXPECT_EQ(kTableEntries[0].origin, entry.origin);
+    EXPECT_EQ(kTableEntries[0].used_count, entry.used_count);
+    EXPECT_EQ(kTableEntries[0].last_access_time, entry.last_access_time);
+    EXPECT_EQ(kTableEntries[0].last_modified_time, entry.last_modified_time);

[michaeln, 2015/10/30 00:49:02]

can you add a test negative, try to get info for an origin that is not in the
table

[calamity, 2015/11/02 06:27:44]

Done.

+  }
+
  private:
   template <typename Iterator>
   void AssignQuotaTable(sql::Connection* db, Iterator itr, Iterator end) {
     ASSERT_NE(db, (sql::Connection*)NULL);
     for (; itr != end; ++itr) {
       const char* kSql =
           "INSERT INTO HostQuotaTable"
           " (host, type, quota)"
           " VALUES (?, ?, ?)";
       sql::Statement statement;
@@ skipping 180 matching lines @@
 }
 
 TEST_F(QuotaDatabaseTest, DumpOriginInfoTable) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
   const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   DumpOriginInfoTable(kDbFile);
   DumpOriginInfoTable(base::FilePath());
 }
 
+TEST_F(QuotaDatabaseTest, GetOriginInfo) {
+  base::ScopedTempDir data_dir;
+  ASSERT_TRUE(data_dir.CreateUniqueTempDir());
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
+  GetOriginInfo(kDbFile);

[michaeln, 2015/10/30 00:49:02]

Any test that touches the disk is incredibly slow.

I see you're following the example of all the other tests in here by conducting
the test with an in memory and on disk sqlitedb. I'd vote to skip the on disk
test. Sqlite has seperate test coverage and the new code for the new quotadb
method doesn't handle disk vs mem any differently.

[calamity, 2015/11/02 06:27:44]

Done.

+  GetOriginInfo(base::FilePath());
+}
+
 TEST_F(QuotaDatabaseTest, OpenCorruptedDatabase) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
   const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   LazyOpen(kDbFile);
   ASSERT_TRUE(sql::test::CorruptSizeInHeader(kDbFile));
   sql::ScopedErrorIgnorer ignore_errors;
   ignore_errors.IgnoreError(SQLITE_CORRUPT);
   Reopen(kDbFile);
   EXPECT_TRUE(ignore_errors.CheckIgnoredErrors());
 }
 
 }  // namespace content