AppCache + Quota integration

webkit/appcache/appcache_storage_impl.h

Index: webkit/appcache/appcache_storage_impl.h
===================================================================
--- webkit/appcache/appcache_storage_impl.h	(revision 88004)
+++ webkit/appcache/appcache_storage_impl.h	(working copy)
@@ -7,7 +7,6 @@
 
 #include <deque>
 #include <map>
-#include <set>
 #include <vector>
 
 #include "base/file_path.h"
@@ -80,6 +79,7 @@
   typedef std::map<int64, CacheLoadTask*> PendingCacheLoads;
   typedef std::map<GURL, GroupLoadTask*> PendingGroupLoads;
   typedef std::deque<std::pair<GURL, int64> > PendingForeignMarkings;
+  typedef std::set<StoreGroupAndCacheTask*> PendingQuotaQueries;
 
   bool IsInitTaskComplete() {
     return last_cache_id_ != AppCacheStorage::kUnitializedId;
@@ -127,6 +127,7 @@
   PendingCacheLoads pending_cache_loads_;
   PendingGroupLoads pending_group_loads_;
   PendingForeignMarkings pending_foreign_markings_;
+  PendingQuotaQueries pending_quota_queries_;
 
   // Structures to keep track of lazy response deletion.
   std::deque<int64> deletable_response_ids_;
@@ -151,7 +152,6 @@
 
   // Used to short-circuit certain operations without having to schedule
   // any tasks on the background database thread.
-  std::set<GURL> origins_with_groups_;
   std::deque<Task*> pending_simple_tasks_;
   ScopedRunnableMethodFactory<AppCacheStorageImpl> method_factory_;