More WebSQLDatabase and QuotaManager integration.

webkit/database/database_tracker.h

Index: webkit/database/database_tracker.h
===================================================================
--- webkit/database/database_tracker.h	(revision 86537)
+++ webkit/database/database_tracker.h	(working copy)
@@ -40,7 +40,6 @@
 extern const FilePath::CharType kTrackerDatabaseFileName[];
 
 class DatabasesTable;
-class QuotaTable;
 
 // This class is used to store information about all databases in an origin.
 class OriginInfo {
@@ -51,7 +50,6 @@
 
   const string16& GetOrigin() const { return origin_; }
   int64 TotalSize() const { return total_size_; }
-  int64 Quota() const { return quota_; }
   void GetAllDatabaseNames(std::vector<string16>* databases) const;
   int64 GetDatabaseSize(const string16& database_name) const;
   string16 GetDatabaseDescription(const string16& database_name) const;
@@ -59,15 +57,14 @@
  protected:
   typedef std::map<string16, std::pair<int64, string16> > DatabaseInfoMap;
 
-  OriginInfo(const string16& origin, int64 total_size, int64 quota);
+  OriginInfo(const string16& origin, int64 total_size);
 
   string16 origin_;
   int64 total_size_;
-  int64 quota_;
   DatabaseInfoMap database_info_;
 };
 
-// This class manages the main database, and keeps track of per origin quotas.
+// This class manages the main database and keeps track of open databases.
 //
 // The data in this class is not thread-safe, so all methods of this class
 // should be called on the same thread. The only exceptions are the ctor(),
@@ -84,8 +81,7 @@
    public:
     virtual void OnDatabaseSizeChanged(const string16& origin_identifier,
                                        const string16& database_name,
-                                       int64 database_size,
-                                       int64 space_available) = 0;
+                                       int64 database_size) = 0;
     virtual void OnDatabaseScheduledForDeletion(
         const string16& origin_identifier,
         const string16& database_name) = 0;
@@ -101,8 +97,7 @@
                       const string16& database_name,
                       const string16& database_details,
                       int64 estimated_size,
-                      int64* database_size,
-                      int64* space_available);
+                      int64* database_size);
   void DatabaseModified(const string16& origin_identifier,
                         const string16& database_name);
   void DatabaseClosed(const string16& origin_identifier,
@@ -123,12 +118,6 @@
   virtual bool GetAllOriginIdentifiers(std::vector<string16>* origin_ids);
   virtual bool GetAllOriginsInfo(std::vector<OriginInfo>* origins_info);
 
-  // TODO(michaeln): remove quota related stuff when quota manager
-  // integration is complete
-  void SetOriginQuota(const string16& origin_identifier, int64 new_quota);
-  int64 GetDefaultQuota() { return default_quota_; }
-  void SetDefaultQuota(int64 quota);  // for testing
-
   // Safe to call on any thread.
   quota::QuotaManagerProxy* quota_manager_proxy() const {
     return quota_manager_proxy_.get();
@@ -185,9 +174,8 @@
 
   class CachedOriginInfo : public OriginInfo {
    public:
-    CachedOriginInfo() : OriginInfo(string16(), 0, 0) {}
+    CachedOriginInfo() : OriginInfo(string16(), 0) {}
     void SetOrigin(const string16& origin) { origin_ = origin; }
-    void SetQuota(int64 new_quota) { quota_ = new_quota; }
     void SetDatabaseSize(const string16& database_name, int64 new_size) {
       int64 old_size = 0;
       if (database_info_.find(database_name) != database_info_.end())
@@ -223,11 +211,11 @@
 
   int64 GetDBFileSize(const string16& origin_identifier,
                       const string16& database_name);
+  int64 SeedOpenDatabaseSize(const string16& origin_identifier,
+                             const string16& database_name);
+  int64 UpdateOpenDatabaseSizeAndNotify(const string16& origin_identifier,
+                                        const string16& database_name);
 
-  int64 GetOriginSpaceAvailable(const string16& origin_identifier);
-
-  int64 UpdateCachedDatabaseFileSize(const string16& origin_identifier,
-                                     const string16& database_name);
   void ScheduleDatabaseForDeletion(const string16& origin_identifier,
                                    const string16& database_name);
   // Schedule a set of open databases for deletion. If non-null, callback is
@@ -245,7 +233,6 @@
   const FilePath db_dir_;
   scoped_ptr<sql::Connection> db_;
   scoped_ptr<DatabasesTable> databases_table_;
-  scoped_ptr<QuotaTable> quota_table_;
   scoped_ptr<sql::MetaTable> meta_table_;
   ObserverList<Observer, true> observers_;
   std::map<string16, CachedOriginInfo> origins_info_map_;
@@ -255,9 +242,6 @@
   DatabaseSet dbs_to_be_deleted_;
   PendingCompletionMap deletion_callbacks_;
 
-  // Default quota for all origins; changed only by tests
-  int64 default_quota_;
-
   // Apps and Extensions can have special rights.
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;