AppCache + Quota integration

webkit/appcache/appcache_database.h

Index: webkit/appcache/appcache_database.h
===================================================================
--- webkit/appcache/appcache_database.h	(revision 88615)
+++ webkit/appcache/appcache_database.h	(working copy)
@@ -5,6 +5,7 @@
 #ifndef WEBKIT_APPCACHE_APPCACHE_DATABASE_H_
 #define WEBKIT_APPCACHE_APPCACHE_DATABASE_H_
 
+#include <map>
 #include <set>
 #include <vector>
 
@@ -22,10 +23,6 @@
 class StatementID;
 }
 
-namespace webkit_database {
-class QuotaTable;
-}
-
 namespace appcache {
 
 class AppCacheDatabase {
@@ -86,9 +83,8 @@
   void Disable();
   bool is_disabled() const { return is_disabled_; }
 
-  int64 GetDefaultOriginQuota() { return 5 * 1024 * 1024; }
   int64 GetOriginUsage(const GURL& origin);
-  int64 GetOriginQuota(const GURL& origin);
+  bool GetAllOriginUsage(std::map<GURL, int64>* usage_map);
 
   bool FindOriginsWithGroups(std::set<GURL>* origins);
   bool FindLastStorageIds(
@@ -198,7 +194,6 @@
   FilePath db_file_path_;
   scoped_ptr<sql::Connection> db_;
   scoped_ptr<sql::MetaTable> meta_table_;
-  scoped_ptr<webkit_database::QuotaTable> quota_table_;
   bool is_disabled_;
   bool is_recreating_;
 
@@ -210,7 +205,7 @@
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, OnlineWhiteListRecords);
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, ReCreate);
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, DeletableResponseIds);
-  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, Quotas);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, OriginUsage);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheDatabase);
 };