Implement EvictOriginData in QuotaManager.

webkit/quota/quota_manager_unittest.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_temp_dir.h"
@@ skipping 114 matching lines @@
         callback_factory_.NewCallback(
             &QuotaManagerTest::DidGetHostUsage));
   }
 
   void RunAdditionalUsageAndQuotaTask(const GURL& origin, StorageType type) {
     quota_manager_->GetUsageAndQuota(origin, type,
         callback_factory_.NewCallback(
             &QuotaManagerTest::DidGetUsageAndQuotaAdditional));
   }
 
   void DeleteOriginData(QuotaClient* client,

[kinuko, 2011/05/18 04:45:12]

Could we rename this to DeleteClientOriginData and DidDeleteClientData to avoid
confusion?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 05:08:00]

Done.

                         const GURL& origin,
                         StorageType type) {
     quota_status_ = kQuotaStatusUnknown;
     client->DeleteOriginData(origin, type,
         callback_factory_.NewCallback(
             &QuotaManagerTest::DidDelete));
   }
 
+  void EvictOriginData(const GURL& origin,
+                       StorageType type) {
+    quota_status_ = kQuotaStatusUnknown;
+    quota_manager_->EvictOriginData(origin, type,
+        callback_factory_.NewCallback(
+            &QuotaManagerTest::DidEvict));
+  }
+
   void GetAvailableSpace() {
     quota_status_ = kQuotaStatusUnknown;
     quota_ = -1;
     quota_manager_->GetAvailableSpace(
         callback_factory_.NewCallback(
             &QuotaManagerTest::DidGetQuota));
   }
 
   void DidGetUsageAndQuota(QuotaStatusCode status, int64 usage, int64 quota) {
     quota_status_ = status;
@@ skipping 18 matching lines @@
   }
 
   void DidGetHostUsage(const std::string&, int64 usage) {
     usage_ = usage;
   }
 
   void DidDelete(QuotaStatusCode status) {
     quota_status_ = status;
   }
 
+  void DidEvict(QuotaStatusCode status) {
+    quota_status_ = status;
+  }
+
   void set_additional_callback_count(int c) { additional_callback_count_ = c; }
   int additional_callback_count() const { return additional_callback_count_; }
   void DidGetUsageAndQuotaAdditional(
       QuotaStatusCode status, int64 usage, int64 quota) {
     ++additional_callback_count_;
   }
 
   QuotaManager* quota_manager() const { return quota_manager_.get(); }
   void set_quota_manager(QuotaManager* quota_manager) {
     quota_manager_ = quota_manager;
@@ skipping 537 matching lines @@
 }
 
 TEST_F(QuotaManagerTest, GetAvailableSpaceTest) {
   GetAvailableSpace();
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(kQuotaStatusOk, status());
   EXPECT_LE(0, quota());
   int64 direct_called = base::SysInfo::AmountOfFreeDiskSpace(profile_path());
   EXPECT_EQ(direct_called, quota());
 }
+
+TEST_F(QuotaManagerTest, EvictOriginData) {
+  static const MockOriginData kData1[] = {
+    { "http://foo.com/",   kStorageTypeTemporary,        1 },
+    { "http://foo.com:1/", kStorageTypeTemporary,       20 },
+    { "http://foo.com/",   kStorageTypePersistent,     300 },
+    { "http://bar.com/",   kStorageTypeTemporary,     4000 },
+  };
+  static const MockOriginData kData2[] = {
+    { "http://foo.com/",   kStorageTypeTemporary,    50000 },
+    { "http://foo.com:1/", kStorageTypeTemporary,     6000 },
+    { "http://foo.com/",   kStorageTypePersistent,     700 },
+    { "https://foo.com/",  kStorageTypeTemporary,       80 },
+    { "http://bar.com/",   kStorageTypeTemporary,        9 },
+  };
+  MockStorageClient* client1 = CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1));
+  MockStorageClient* client2 = CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2));
+  RegisterClient(client1);
+  RegisterClient(client2);
+
+  GetGlobalUsage(kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  int64 predelete_global_tmp = usage();
+
+  GetHostUsage("foo.com", kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  int64 predelete_host_tmp = usage();
+
+  GetHostUsage("foo.com", kStorageTypePersistent);
+  MessageLoop::current()->RunAllPending();
+  int64 predelete_host_pers = usage();
+
+  EvictOriginData(GURL("http://foo.com/"), kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+
+  GetGlobalUsage(kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  EXPECT_EQ(predelete_global_tmp - (1 + 50000), usage());
+
+  GetHostUsage("foo.com", kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  EXPECT_EQ(predelete_host_tmp - (1 + 50000), usage());
+
+  GetHostUsage("foo.com", kStorageTypePersistent);
+  MessageLoop::current()->RunAllPending();
+  EXPECT_EQ(predelete_host_pers, usage());
+}
+
 }  // namespace quota