Improve IndexedDB's quota support

content/browser/in_process_webkit/indexed_db_quota_client_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 <map>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
@@ skipping 18 matching lines @@
   const GURL kOriginB;
   const GURL kOriginOther;
 
   IndexedDBQuotaClientTest()
       : kOriginA("http://host"),
         kOriginB("http://host:8000"),
         kOriginOther("http://other"),
         usage_(0),
         callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         message_loop_(MessageLoop::TYPE_IO),
-        webkit_thread_(BrowserThread::WEBKIT, &message_loop_) {
+        webkit_thread_(BrowserThread::WEBKIT, &message_loop_),
+        io_thread_(BrowserThread::IO, &message_loop_) {
     TestingProfile profile;
     idb_context_ = profile.GetWebKitContext()->indexed_db_context();
     setup_temp_dir();
   }
   void setup_temp_dir() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     FilePath indexeddb_dir = temp_dir_.path().Append(
         IndexedDBContext::kIndexedDBDirectory);
     ASSERT_TRUE(file_util::CreateDirectory(indexeddb_dir));
     idb_context()->set_data_path(indexeddb_dir);
@@ skipping 36 matching lines @@
       quota::StorageType type,
       const std::string& host) {
     origins_.clear();
     client->GetOriginsForHost(type, host,
         callback_factory_.NewCallback(
             &IndexedDBQuotaClientTest::OnGetOriginsComplete));
     MessageLoop::current()->RunAllPending();
     return origins_;
   }
 
+  quota::QuotaStatusCode DeleteOrigin(quota::QuotaClient* client,
+                                  const GURL& origin_url) {

[kinuko, 2011/08/03 09:12:22]

weird indent

[dgrogan, 2011/08/03 21:45:47]

Done.

+    delete_status_ = quota::kQuotaStatusUnknown;
+    client->DeleteOriginData(origin_url, kTemp, callback_factory_.NewCallback(
+            &IndexedDBQuotaClientTest::OnDeleteOriginComplete));

[kinuko, 2011/08/03 09:12:22]

weird indent

[dgrogan, 2011/08/03 21:45:47]

Done.

+    MessageLoop::current()->RunAllPending();
+    return delete_status_;
+  }
+
   IndexedDBContext* idb_context() { return idb_context_.get(); }
 
   void SetFileSizeTo(const FilePath& path, int size) {
     std::string junk(size, 'a');
     ASSERT_EQ(size, file_util::WriteFile(path, junk.c_str(), size));
   }
 
   void AddFakeIndexedDB(const GURL& origin, int size) {
     FilePath file_path_origin = idb_context()->GetIndexedDBFilePath(
         DatabaseUtil::GetOriginIdentifier(origin));
     if (!file_util::CreateDirectory(file_path_origin)) {
       LOG(ERROR) << "failed to file_util::CreateDirectory "
                  << file_path_origin.value();
     }
     file_path_origin = file_path_origin.Append(FILE_PATH_LITERAL("fake_file"));
     SetFileSizeTo(file_path_origin, size);
   }
 
  private:
   void OnGetOriginUsageComplete(int64 usage) {
     usage_ = usage;
   }
 
   void OnGetOriginsComplete(const std::set<GURL>& origins) {
     origins_ = origins;
   }
 
+  void OnDeleteOriginComplete(quota::QuotaStatusCode code) {
+    delete_status_ = code;
+  }
+
   ScopedTempDir temp_dir_;
   int64 usage_;
   std::set<GURL> origins_;
   scoped_refptr<IndexedDBContext> idb_context_;
   base::ScopedCallbackFactory<IndexedDBQuotaClientTest> callback_factory_;
   MessageLoop message_loop_;
   BrowserThread webkit_thread_;
+  BrowserThread io_thread_;
+  quota::QuotaStatusCode delete_status_;
 };
 
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginUsage) {
   IndexedDBQuotaClient client(
       base::MessageLoopProxy::CreateForCurrentThread(),
       idb_context());
 
   AddFakeIndexedDB(kOriginA, 6);
   AddFakeIndexedDB(kOriginB, 3);
@@ skipping 43 matching lines @@
   EXPECT_TRUE(GetOriginsForType(&client, kTemp).empty());
   EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
 
   AddFakeIndexedDB(kOriginA, 1000);
   std::set<GURL> origins = GetOriginsForType(&client, kTemp);
   EXPECT_EQ(origins.size(), 1ul);
   EXPECT_TRUE(origins.find(kOriginA) != origins.end());
 
   EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
 }
+
+TEST_F(IndexedDBQuotaClientTest, DeleteOrigin) {
+  IndexedDBQuotaClient client(
+      base::MessageLoopProxy::CreateForCurrentThread(),
+      idb_context());
+
+  AddFakeIndexedDB(kOriginA, 1000);
+  AddFakeIndexedDB(kOriginB, 50);
+  EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp));
+  EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
+
+  quota::QuotaStatusCode delete_status = DeleteOrigin(&client, kOriginA);
+  EXPECT_EQ(quota::kQuotaStatusOk, delete_status);
+  EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
+  EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
+}