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

chrome/browser/worker_host/worker_process_host.cc

Index: chrome/browser/worker_host/worker_process_host.cc
===================================================================
--- chrome/browser/worker_host/worker_process_host.cc	(revision 68877)
+++ chrome/browser/worker_host/worker_process_host.cc	(working copy)
@@ -21,7 +21,7 @@
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/blob_dispatcher_host.h"
-#include "chrome/browser/renderer_host/database_dispatcher_host.h"
+#include "chrome/browser/renderer_host/database_message_filter.h"
 #include "chrome/browser/renderer_host/file_utilities_dispatcher_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ -80,9 +80,6 @@
           new MimeRegistryDispatcher(this))) {
   next_route_id_callback_.reset(NewCallbackWithReturnValue(
       WorkerService::GetInstance(), &WorkerService::next_worker_route_id));
-  db_dispatcher_host_ = new DatabaseDispatcherHost(
-      request_context->database_tracker(), this,
-      request_context_->host_content_settings_map());
 }
 
 WorkerProcessHost::~WorkerProcessHost() {
@@ -91,9 +88,6 @@
     filters_[i]->OnFilterRemoved();
   }
 
-  // Shut down the database dispatcher host.
-  db_dispatcher_host_->Shutdown();
-
   // Shut down the blob dispatcher host.
   blob_dispatcher_host_->Shutdown();
 
@@ -224,6 +218,9 @@
 
 void WorkerProcessHost::CreateMessageFilters() {
   filters_.push_back(new AppCacheDispatcherHost(request_context_, id()));
+  filters_.push_back(new DatabaseMessageFilter(
+      request_context_->database_tracker(),
+      request_context_->host_content_settings_map()));
 
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnFilterAdded(channel());
@@ -298,7 +295,6 @@
 
   bool msg_is_ok = true;
   bool handled =
-      db_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
       blob_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
       file_system_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
       file_utilities_dispatcher_host_->OnMessageReceived(message) ||
@@ -362,7 +358,6 @@
 }
 
 void WorkerProcessHost::OnProcessLaunched() {
-  db_dispatcher_host_->Init(handle());
   file_system_dispatcher_host_->Init(handle());
   file_utilities_dispatcher_host_->Init(handle());
 }