Added DeleteOriginData to QuotaClient

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 "testing/gtest/include/gtest/gtest.h"
-
 #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"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/stl_util-inl.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaType.h"
 #include "webkit/quota/mock_storage_client.h"
 #include "webkit/quota/quota_database.h"
 #include "webkit/quota/quota_manager.h"
 
 using base::MessageLoopProxy;
 using WebKit::WebStorageQuotaError;
 using WebKit::WebStorageQuotaType;
 
@@ skipping 99 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,
+                        const GURL& origin,
+                        StorageType type) {
+    quota_status_ = kQuotaStatusUnknown;
+    client->DeleteOriginData(origin, type,
+        callback_factory_.NewCallback(
+            &QuotaManagerTest::DidDelete));
+  }
+
   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;
   }
 
   void DidGetHostQuota(QuotaStatusCode status,
                        const std::string& host, int64 quota) {
     quota_status_ = status;
     host_ = host;
     quota_ = quota;
   }
 
   void DidGetGlobalUsage(int64 usage) {
     usage_ = usage;
   }
 
   void DidGetHostUsage(const std::string&, int64 usage) {
     usage_ = usage;
   }
 
+  void DidDelete(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 489 matching lines @@
   EXPECT_EQ(usage(), 4000 + 50000);
 
   client->ModifyMockOriginDataSize(
       GURL("http://buz.com/"), kStorageTypeTemporary, 900000000);
 
   GetHostUsage("buz.com", kStorageTypeTemporary);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(usage(), 4000 + 50000 + 900000000);
 }
 
+TEST_F(QuotaManagerTest, GetUsage_WithDeleteOrigin) {
+  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();
+  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();
+
+  DeleteOriginData(client, GURL("http://foo.com/"), kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  EXPECT_EQ(kQuotaStatusOk, status());
+
+  GetGlobalUsage(kStorageTypeTemporary);
+  MessageLoop::current()->RunAllPending();
+  EXPECT_EQ(predelete_global_tmp - 1, usage());
+
+  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());
+}
+
 }  // namespace quota