Revert 91690 - Implement QM::GetOriginsModifiedSince for browser data deleter support

webkit/quota/quota_manager_unittest.cc

Index: webkit/quota/quota_manager_unittest.cc
===================================================================
--- webkit/quota/quota_manager_unittest.cc	(revision 91690)
+++ webkit/quota/quota_manager_unittest.cc	(working copy)
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <set>
 #include <sstream>
 #include <vector>
 
@@ -38,13 +37,13 @@
  protected:
   typedef QuotaManager::QuotaTableEntry QuotaTableEntry;
   typedef QuotaManager::QuotaTableEntries QuotaTableEntries;
-  typedef QuotaManager::OriginInfoTableEntry OriginInfoTableEntry;
-  typedef QuotaManager::OriginInfoTableEntries OriginInfoTableEntries;
+  typedef QuotaManager::LastAccessTimeTableEntry LastAccessTimeTableEntry;
+  typedef QuotaManager::LastAccessTimeTableEntries LastAccessTimeTableEntries;
 
  public:
   QuotaManagerTest()
       : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-        mock_time_counter_(0) {
+        virtual_time_counter_(0) {
   }
 
   void SetUp() {
@@ -203,7 +202,7 @@
                              StorageType type) {
     DCHECK(client);
     quota_manager_->NotifyStorageAccessedInternal(
-        client->id(), origin, type, IncrementMockTime());
+        client->id(), origin, type, GetCurrentMockTime());
   }
 
   void DeleteOriginFromDatabase(const GURL& origin, StorageType type) {
@@ -224,13 +223,6 @@
     quota_manager_->NotifyOriginNoLongerInUse(origin);
   }
 
-  void GetOriginsModifiedSince(StorageType type, base::Time modified_since) {
-    modified_origins_.clear();
-    quota_manager_->GetOriginsModifiedSince(type, modified_since,
-        callback_factory_.NewCallback(
-            &QuotaManagerTest::DidGetModifiedOrigins));
-  }
-
   void DumpQuotaTable() {
     quota_table_.clear();
     quota_manager_->DumpQuotaTable(
@@ -238,11 +230,11 @@
             &QuotaManagerTest::DidDumpQuotaTable));
   }
 
-  void DumpOriginInfoTable() {
-    origin_info_table_.clear();
-    quota_manager_->DumpOriginInfoTable(
+  void DumpLastAccessTimeTable() {
+    last_access_time_table_.clear();
+    quota_manager_->DumpLastAccessTimeTable(
         callback_factory_.NewCallback(
-            &QuotaManagerTest::DidDumpOriginInfoTable));
+            &QuotaManagerTest::DidDumpLastAccessTimeTable));
   }
 
   void DidGetUsageAndQuota(QuotaStatusCode status, int64 usage, int64 quota) {
@@ -307,16 +299,12 @@
     lru_origin_ = origin;
   }
 
-  void DidGetModifiedOrigins(const std::set<GURL>& origins) {
-    modified_origins_ = origins;
-  }
-
   void DidDumpQuotaTable(const QuotaTableEntries& entries) {
     quota_table_ = entries;
   }
 
-  void DidDumpOriginInfoTable(const OriginInfoTableEntries& entries) {
-    origin_info_table_ = entries;
+  void DidDumpLastAccessTimeTable(const LastAccessTimeTableEntries& entries) {
+    last_access_time_table_ = entries;
   }
 
   void GetUsage_WithModifyTestBody(const StorageType type);
@@ -345,19 +333,18 @@
   int64 quota() const { return quota_; }
   int64 available_space() const { return available_space_; }
   const GURL& lru_origin() const { return lru_origin_; }
-  const std::set<GURL>& modified_origins() const { return modified_origins_; }
   const QuotaTableEntries& quota_table() const { return quota_table_; }
-  const OriginInfoTableEntries& last_access_time_table() const {
-    return origin_info_table_;
+  const LastAccessTimeTableEntries& last_access_time_table() const {
+    return last_access_time_table_;
   }
   FilePath profile_path() const { return data_dir_.path(); }
   int status_callback_count() const { return status_callback_count_; }
   void reset_status_callback_count() { status_callback_count_ = 0; }
 
  private:
-  base::Time IncrementMockTime() {
-    ++mock_time_counter_;
-    return base::Time::FromDoubleT(mock_time_counter_ * 10.0);
+  base::Time GetCurrentMockTime() {
+    ++virtual_time_counter_;
+    return base::Time::FromDoubleT(virtual_time_counter_ * 10.0);
   }
 
   ScopedTempDir data_dir_;
@@ -374,14 +361,13 @@
   int64 quota_;
   int64 available_space_;
   GURL lru_origin_;
-  std::set<GURL> modified_origins_;
   QuotaTableEntries quota_table_;
-  OriginInfoTableEntries origin_info_table_;
+  LastAccessTimeTableEntries last_access_time_table_;
   int status_callback_count_;
 
   int additional_callback_count_;
 
-  int mock_time_counter_;
+  int virtual_time_counter_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaManagerTest);
 };
@@ -1065,10 +1051,10 @@
   EvictOriginData(GURL("http://foo.com/"), kTemp);
   MessageLoop::current()->RunAllPending();
 
-  DumpOriginInfoTable();
+  DumpLastAccessTimeTable();
   MessageLoop::current()->RunAllPending();
 
-  typedef OriginInfoTableEntries::const_iterator iterator;
+  typedef LastAccessTimeTableEntries::const_iterator iterator;
   for (iterator itr(last_access_time_table().begin()),
                 end(last_access_time_table().end());
        itr != end; ++itr) {
@@ -1126,11 +1112,11 @@
     EXPECT_EQ(kQuotaErrorInvalidModification, status());
   }
 
-  DumpOriginInfoTable();
+  DumpLastAccessTimeTable();
   MessageLoop::current()->RunAllPending();
 
   bool found_origin_in_database = false;
-  typedef OriginInfoTableEntries::const_iterator iterator;
+  typedef LastAccessTimeTableEntries::const_iterator iterator;
   for (iterator itr(last_access_time_table().begin()),
                 end(last_access_time_table().end());
        itr != end; ++itr) {
@@ -1254,10 +1240,10 @@
 
   EXPECT_EQ(3, status_callback_count());
 
-  DumpOriginInfoTable();
+  DumpLastAccessTimeTable();
   MessageLoop::current()->RunAllPending();
 
-  typedef OriginInfoTableEntries::const_iterator iterator;
+  typedef LastAccessTimeTableEntries::const_iterator iterator;
   for (iterator itr(last_access_time_table().begin()),
                 end(last_access_time_table().end());
        itr != end; ++itr) {
@@ -1422,54 +1408,6 @@
   EXPECT_EQ("http://a.com/", lru_origin().spec());
 }
 
-TEST_F(QuotaManagerTest, GetOriginsModifiedSince) {
-  static const MockOriginData kData[] = {
-    { "http://a.com/",   kTemp,  0 },
-    { "http://a.com:1/", kTemp,  0 },
-    { "https://a.com/",  kTemp,  0 },
-    { "http://b.com/",   kPerm,  0 },  // persistent
-    { "http://c.com/",   kTemp,  0 },
-  };
-  MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
-  RegisterClient(client);
-
-  GetOriginsModifiedSince(kTemp, base::Time());
-  MessageLoop::current()->RunAllPending();
-  EXPECT_TRUE(modified_origins().empty());
-
-  base::Time time1 = client->IncrementMockTime();
-  client->ModifyOriginAndNotify(GURL("http://a.com/"), kTemp, 10);
-  client->ModifyOriginAndNotify(GURL("http://a.com:1/"), kTemp, 10);
-  client->ModifyOriginAndNotify(GURL("http://b.com/"), kPerm, 10);
-  base::Time time2 = client->IncrementMockTime();
-  client->ModifyOriginAndNotify(GURL("https://a.com/"), kTemp, 10);
-  client->ModifyOriginAndNotify(GURL("http://c.com/"), kTemp, 10);
-  base::Time time3 = client->IncrementMockTime();
-
-  GetOriginsModifiedSince(kTemp, time1);
-  MessageLoop::current()->RunAllPending();
-  EXPECT_EQ(4U, modified_origins().size());
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData); ++i) {
-    if (kData[i].type == kTemp)
-      EXPECT_EQ(1U, modified_origins().count(GURL(kData[i].origin)));
-  }
-
-  GetOriginsModifiedSince(kTemp, time2);
-  MessageLoop::current()->RunAllPending();
-  EXPECT_EQ(2U, modified_origins().size());
-
-  GetOriginsModifiedSince(kTemp, time3);
-  MessageLoop::current()->RunAllPending();
-  EXPECT_TRUE(modified_origins().empty());
-
-  client->ModifyOriginAndNotify(GURL("http://a.com/"), kTemp, 10);
-
-  GetOriginsModifiedSince(kTemp, time3);
-  MessageLoop::current()->RunAllPending();
-  EXPECT_EQ(1U, modified_origins().size());
-  EXPECT_EQ(1U, modified_origins().count(GURL("http://a.com/")));
-}
-
 TEST_F(QuotaManagerTest, DumpQuotaTable) {
   SetPersistentHostQuota("example1.com", 1);
   SetPersistentHostQuota("example2.com", 20);
@@ -1498,7 +1436,7 @@
   EXPECT_TRUE(entries.empty());
 }
 
-TEST_F(QuotaManagerTest, DumpOriginInfoTable) {
+TEST_F(QuotaManagerTest, DumpLastAccessTimeTable) {
   using std::make_pair;
 
   quota_manager()->NotifyStorageAccessed(
@@ -1515,7 +1453,7 @@
       kPerm);
   MessageLoop::current()->RunAllPending();
 
-  DumpOriginInfoTable();
+  DumpLastAccessTimeTable();
   MessageLoop::current()->RunAllPending();
 
   typedef std::pair<GURL, StorageType> TypedOrigin;
@@ -1527,7 +1465,7 @@
   std::set<Entry> entries
       (kEntries, kEntries + ARRAYSIZE_UNSAFE(kEntries));
 
-  typedef OriginInfoTableEntries::const_iterator iterator;
+  typedef LastAccessTimeTableEntries::const_iterator iterator;
   for (iterator itr(last_access_time_table().begin()),
                 end(last_access_time_table().end());
        itr != end; ++itr) {