Actually delete databases in CookiesTreeModel.

webkit/database/database_tracker.h

 // Copyright (c) 2010 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.
 
 #ifndef WEBKIT_DATABASE_DATABASE_TRACKER_H_
 #define WEBKIT_DATABASE_DATABASE_TRACKER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 23 matching lines @@
  public:
   OriginInfo(const OriginInfo& origin_info)
       : origin_(origin_info.origin_),
         total_size_(origin_info.total_size_),
         quota_(origin_info.quota_),
         database_info_(origin_info.database_info_) {}
   const string16& GetOrigin() const { return origin_; }
   int64 TotalSize() const { return total_size_; }
   int64 Quota() const { return quota_; }
   void GetAllDatabaseNames(std::vector<string16>* databases) const {
-    for (std::map<string16, DatabaseInfo>::const_iterator it =
-         database_info_.begin(); it != database_info_.end(); it++) {
+    for (DatabaseInfoMap::const_iterator it = database_info_.begin();
+         it != database_info_.end(); it++) {
       databases->push_back(it->first);
     }
   }
   int64 GetDatabaseSize(const string16& database_name) const {
-    std::map<string16, DatabaseInfo>::const_iterator it =
-        database_info_.find(database_name);
+    DatabaseInfoMap::const_iterator it = database_info_.find(database_name);
     if (it != database_info_.end())
       return it->second.first;
     return 0;
   }
   string16 GetDatabaseDescription(const string16& database_name) const {
-    std::map<string16, DatabaseInfo>::const_iterator it =
-        database_info_.find(database_name);
+    DatabaseInfoMap::const_iterator it = database_info_.find(database_name);
     if (it != database_info_.end())
       return it->second.second;
     return string16();
   }
 
  protected:
-  typedef std::pair<int64, string16> DatabaseInfo;
+  typedef std::map<string16, std::pair<int64, string16> > DatabaseInfoMap;
 
   OriginInfo(const string16& origin, int64 total_size, int64 quota)
       : origin_(origin), total_size_(total_size), quota_(quota) { }
 
   string16 origin_;
   int64 total_size_;
   int64 quota_;
-  std::map<string16, DatabaseInfo> database_info_;
+  DatabaseInfoMap database_info_;
 };
 
 // This class manages the main database, and keeps track of per origin quotas.
 //
 // The data in this class is not thread-safe, so all methods of this class
 // should be called on the same thread. The only exception is
 // database_directory() which returns a constant that is initialized when
 // the DatabaseTracker instance is created.
 //
 // Furthermore, some methods of this class have to read/write data from/to
@@ skipping 10 matching lines @@
                                        int64 database_size,
                                        int64 space_available) = 0;
     virtual void OnDatabaseScheduledForDeletion(
         const string16& origin_identifier,
         const string16& database_name) = 0;
     virtual ~Observer() {}
   };
 
   explicit DatabaseTracker(const FilePath& profile_path);
 
-  // Sets the default quota for all origins. Should be used in tests only.
-  void SetDefaultQuota(int64 quota);
-
   void DatabaseOpened(const string16& origin_identifier,
                       const string16& database_name,
                       const string16& database_details,
                       int64 estimated_size,
                       int64* database_size,
                       int64* space_available);
   void DatabaseModified(const string16& origin_identifier,
                         const string16& database_name);
   void DatabaseClosed(const string16& origin_identifier,
                       const string16& database_name);
   void CloseDatabases(const DatabaseConnections& connections);
   void DeleteDatabaseIfNeeded(const string16& origin_identifier,
                               const string16& database_name);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   void CloseTrackerDatabaseAndClearCaches();
 
   const FilePath& DatabaseDirectory() const { return db_dir_; }
   FilePath GetFullDBFilePath(const string16& origin_identifier,
                              const string16& database_name) const;
 
   bool GetAllOriginsInfo(std::vector<OriginInfo>* origins_info);
   void SetOriginQuota(const string16& origin_identifier, int64 new_quota);
-  bool DeleteDatabase(const string16& origin_identifier,
-                      const string16& database_name);
-  bool DeleteOrigin(const string16& origin_identifier);
+
+  // Sets the default quota for all origins. Should be used in tests only.
+  void SetDefaultQuota(int64 quota);
+
   bool IsDatabaseScheduledForDeletion(const string16& origin_identifier,
                                       const string16& database_name);
 
+  // Deletes a single database. Returns net::OK on success, net::FAILED on
+  // failure, or net::ERR_IO_PENDING and |callback| is invoked upon completion,
+  // if non-NULL.
+  int DeleteDatabase(const string16& origin_identifier,
+                     const string16& database_name,
+                     net::CompletionCallback* callback);
+
   // Delete any databases that have been touched since the cutoff date that's
   // supplied. Returns net::OK on success, net::FAILED if not all databases
   // could be deleted, and net::ERR_IO_PENDING and |callback| is invoked upon
-  // completion.
+  // completion, if non-NULL.
   int DeleteDataModifiedSince(const base::Time& cutoff,
                               net::CompletionCallback* callback);
 
   static void ClearLocalState(const FilePath& profile_path);
 
  private:
   // Need this here to allow RefCountedThreadSafe to call ~DatabaseTracker().
   friend class base::RefCountedThreadSafe<DatabaseTracker>;
 
+  typedef std::map<string16, std::set<string16> > DatabaseSet;
+  typedef std::map<net::CompletionCallback*, DatabaseSet> PendingCompletionMap;
+
   class CachedOriginInfo : public OriginInfo {
    public:
     CachedOriginInfo() : OriginInfo(string16(), 0, 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())
         old_size = database_info_[database_name].first;
       database_info_[database_name].first = new_size;
       if (new_size != old_size)
         total_size_ += new_size - old_size;
     }
     void SetDatabaseDescription(const string16& database_name,
                                 const string16& description) {
       database_info_[database_name].second = description;
     }
   };
 
   ~DatabaseTracker();
 
+  bool DeleteClosedDatabase(const string16& origin_identifier,
+                            const string16& database_name);
+  bool DeleteOrigin(const string16& origin_identifier);
+
   bool LazyInit();
   bool UpgradeToCurrentVersion();
   void InsertOrUpdateDatabaseDetails(const string16& origin_identifier,
                                      const string16& database_name,
                                      const string16& database_details,
                                      int64 estimated_size);
 
   void ClearAllCachedOriginInfo();
   CachedOriginInfo* GetCachedOriginInfo(const string16& origin_identifier);
 
@@ skipping 11 matching lines @@
   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> observers_;
   std::map<string16, CachedOriginInfo> origins_info_map_;
   DatabaseConnections database_connections_;
 
   // The set of databases that should be deleted but are still opened
-  std::map<string16, std::set<string16> > dbs_to_be_deleted_;
-  net::CompletionCallback* dbs_deleted_callback_;
+  DatabaseSet dbs_to_be_deleted_;
+  PendingCompletionMap deletion_callbacks_;
 
   // Default quota for all origins; changed only by tests
   int64 default_quota_;
 
   FRIEND_TEST(DatabaseTrackerTest, TestIt);
 };
 
 }  // namespace webkit_database
 
 #endif  // WEBKIT_DATABASE_DATABASE_TRACKER_H_