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 122 matching lines @@
 
   void DeleteOriginData(QuotaClient* client,
                         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::DidDelete));

[michaeln, 2011/05/17 19:30:01]

DidEvict?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 04:34:48]

Exactly. Done.

+  }
+
   void DidGetUsageAndQuota(QuotaStatusCode status, int64 usage, int64 quota) {
     quota_status_ = status;
     usage_ = usage;
     quota_ = quota;
   }
 
   void DidGetQuota(QuotaStatusCode status, int64 quota) {
     quota_status_ = status;
     quota_ = quota;
   }
@@ skipping 10 matching lines @@
   }
 
   void DidGetHostUsage(const std::string&, int64 usage) {
     usage_ = usage;
   }
 
   void DidDelete(QuotaStatusCode status) {
     quota_status_ = status;
   }
 
+  void DidEvictOriginData(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 528 matching lines @@
 
   GetHostUsage("foo.com", kStorageTypeTemporary);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(predelete_host_tmp - 1, usage());
 
   GetHostUsage("foo.com", kStorageTypePersistent);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(predelete_host_pers, usage());
 }
 
+TEST_F(QuotaManagerTest, EvictOriginData) {
+  static const MockOriginData kData[] = {
+    { "http://foo.com/",   kStorageTypeTemporary,        1 },
+    { "http://foo.com:1/", kStorageTypeTemporary,       20 },
+    { "http://foo.com/",   kStorageTypePersistent,     300 },
+    { "http://bar.com/",   kStorageTypeTemporary,     4000 },
+  };
+  MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+  RegisterClient(client);
+
+  GetGlobalUsage(kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  LOG(ERROR) << usage();
+
+  EvictOriginData(GURL("http://bar.com/"), kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+
+  GetGlobalUsage(kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  LOG(ERROR) << usage();
+}
+
 }  // namespace quota