Make DatabaseDispatcherHost be a message filter so that ResourceMessageFilter...

chrome/browser/renderer_host/resource_message_filter.cc

Index: chrome/browser/renderer_host/resource_message_filter.cc
===================================================================
--- chrome/browser/renderer_host/resource_message_filter.cc	(revision 68877)
+++ chrome/browser/renderer_host/resource_message_filter.cc	(working copy)
@@ -45,7 +45,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/blob_dispatcher_host.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/browser/renderer_host/database_dispatcher_host.h"
 #include "chrome/browser/renderer_host/file_utilities_dispatcher_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_view_host_notification_task.h"
@@ -259,9 +258,6 @@
           new DOMStorageDispatcherHost(this, profile->GetWebKitContext()))),
       ALLOW_THIS_IN_INITIALIZER_LIST(indexed_db_dispatcher_host_(
           new IndexedDBDispatcherHost(this, profile))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(db_dispatcher_host_(
-          new DatabaseDispatcherHost(profile->GetDatabaseTracker(), this,
-              profile->GetHostContentSettingsMap()))),
       notification_prefs_(
           profile->GetDesktopNotificationService()->prefs_cache()),
       host_zoom_map_(profile->GetHostZoomMap()),
@@ -312,9 +308,6 @@
   // Tell the Indexed DB dispatcher host to stop sending messages via us.
   indexed_db_dispatcher_host_->Shutdown();
 
-  // Shut down the database dispatcher host.
-  db_dispatcher_host_->Shutdown();
-
   // Shut down the async file_system dispatcher host.
   file_system_dispatcher_host_->Shutdown();
 
@@ -356,7 +349,6 @@
   WorkerService::GetInstance()->Initialize(resource_dispatcher_host_);
   dom_storage_dispatcher_host_->Init(id(), handle());
   indexed_db_dispatcher_host_->Init(id(), handle());
-  db_dispatcher_host_->Init(handle());
   file_system_dispatcher_host_->Init(handle());
   file_utilities_dispatcher_host_->Init(handle());
 }
@@ -385,7 +377,6 @@
       resource_dispatcher_host_->OnMessageReceived(msg, this, &msg_is_ok) ||
       dom_storage_dispatcher_host_->OnMessageReceived(msg, &msg_is_ok) ||
       indexed_db_dispatcher_host_->OnMessageReceived(msg) ||
-      db_dispatcher_host_->OnMessageReceived(msg, &msg_is_ok) ||
       mp_dispatcher->OnMessageReceived(
           msg, this, next_route_id_callback(), &msg_is_ok) ||
       geolocation_dispatcher_host_->OnMessageReceived(msg, &msg_is_ok) ||