Adding methods that will be used by the quota management UI....

chrome/browser/renderer_host/database_dispatcher_host.cc

 // Copyright (c) 2009 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 "chrome/browser/renderer_host/database_dispatcher_host.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
@@ skipping 49 matching lines @@
   }
 }
 
 void DatabaseDispatcherHost::AddObserver() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   db_tracker_->AddObserver(this);
 }
 
 void DatabaseDispatcherHost::RemoveObserver() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+
+  // If the renderer process died without closing all databases,
+  // then we need to manually close those connections
+  db_tracker_->CloseDatabases(database_connections_);
+  database_connections_.RemoveAllConnections();
+
   db_tracker_->RemoveObserver(this);
 }
 
 bool DatabaseDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* message_was_ok) {
   DCHECK(!shutdown_);
   *message_was_ok = true;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(DatabaseDispatcherHost, message, *message_was_ok)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DatabaseOpenFile, OnDatabaseOpenFile)
@@ skipping 218 matching lines @@
                         estimated_size));
 }
 
 void DatabaseDispatcherHost::DatabaseOpened(const string16& origin_identifier,
                                             const string16& database_name,
                                             const string16& description,
                                             int64 estimated_size) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   int64 database_size = 0;
   int64 space_available = 0;
-  AddAccessedOrigin(origin_identifier);
+  database_connections_.AddConnection(origin_identifier, database_name);
   db_tracker_->DatabaseOpened(origin_identifier, database_name, description,
                               estimated_size, &database_size, &space_available);
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::SendMessage,
                         new ViewMsg_DatabaseUpdateSize(
                             origin_identifier, database_name,
                             database_size, space_available)));
 }
 
 void DatabaseDispatcherHost::OnDatabaseModified(
     const string16& origin_identifier,
     const string16& database_name) {
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseModified,
                         origin_identifier,
                         database_name));
 }
 
 void DatabaseDispatcherHost::DatabaseModified(const string16& origin_identifier,
                                               const string16& database_name) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  if (!HasAccessedOrigin(origin_identifier)) {
+  if (!database_connections_.IsDatabaseOpened(
+          origin_identifier, database_name)) {
     ReceivedBadMessage(ViewHostMsg_DatabaseModified::ID);
     return;
   }
 
   db_tracker_->DatabaseModified(origin_identifier, database_name);
 }
 
 void DatabaseDispatcherHost::OnDatabaseClosed(const string16& origin_identifier,
                                               const string16& database_name) {
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseClosed,
                         origin_identifier,
                         database_name));
 }
 
 void DatabaseDispatcherHost::DatabaseClosed(const string16& origin_identifier,
                                             const string16& database_name) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  if (!HasAccessedOrigin(origin_identifier)) {
+  if (!database_connections_.IsDatabaseOpened(
+          origin_identifier, database_name)) {
     ReceivedBadMessage(ViewHostMsg_DatabaseClosed::ID);
     return;
   }
 
   db_tracker_->DatabaseClosed(origin_identifier, database_name);
+  database_connections_.RemoveConnection(origin_identifier, database_name);
 }
 
 void DatabaseDispatcherHost::OnDatabaseSizeChanged(
     const string16& origin_identifier,
     const string16& database_name,
     int64 database_size,
     int64 space_available) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  if (HasAccessedOrigin(origin_identifier)) {
+  if (database_connections_.IsOriginUsed(origin_identifier)) {
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(this,
                           &DatabaseDispatcherHost::SendMessage,
                           new ViewMsg_DatabaseUpdateSize(
                               origin_identifier, database_name,
                               database_size, space_available)));
   }
 }
-
-void DatabaseDispatcherHost::AddAccessedOrigin(
-    const string16& origin_identifier) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  accessed_origins_.insert(origin_identifier);
-}
-
-bool DatabaseDispatcherHost::HasAccessedOrigin(
-    const string16& origin_identifier) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  return (accessed_origins_.find(origin_identifier) != accessed_origins_.end());
-}