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

chrome/browser/worker_host/worker_process_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/worker_host/worker_process_host.h"
 
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/appcache/appcache_dispatcher_host.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/file_system/file_system_dispatcher_host.h"
 #include "chrome/browser/mime_registry_dispatcher.h"
 #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"
 #include "chrome/browser/renderer_host/render_view_host_notification_task.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/browser/worker_host/message_port_dispatcher.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/debug_flags.h"
 #include "chrome/common/notification_service.h"
@@ skipping 38 matching lines @@
           new BlobDispatcherHost(
               this->id(), request_context->blob_storage_context()))),
       ALLOW_THIS_IN_INITIALIZER_LIST(file_system_dispatcher_host_(
           new FileSystemDispatcherHost(this, request_context))),
       ALLOW_THIS_IN_INITIALIZER_LIST(file_utilities_dispatcher_host_(
           new FileUtilitiesDispatcherHost(this, this->id()))),
       ALLOW_THIS_IN_INITIALIZER_LIST(mime_registry_dispatcher_(
           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() {
   for (size_t i = 0; i < filters_.size(); ++i) {
     filters_[i]->OnChannelClosing();
     filters_[i]->OnFilterRemoved();
   }
 
-  // Shut down the database dispatcher host.
-  db_dispatcher_host_->Shutdown();
-
   // Shut down the blob dispatcher host.
   blob_dispatcher_host_->Shutdown();
 
   // Shut down the file system dispatcher host.
   file_system_dispatcher_host_->Shutdown();
 
   // Shut down the file utilities dispatcher host.
   file_utilities_dispatcher_host_->Shutdown();
 
   // Shut down the mime registry dispatcher host.
@@ skipping 110 matching lines @@
           base::PLATFORM_FILE_WRITE_ATTRIBUTES);
   }
 
   CreateMessageFilters();
 
   return true;
 }
 
 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());
 }
 
 void WorkerProcessHost::CreateWorker(const WorkerInstance& instance) {
   ChildProcessSecurityPolicy::GetInstance()->GrantRequestURL(
       id(), instance.url());
 
   instances_.push_back(instance);
@@ skipping 54 matching lines @@
 }
 
 void WorkerProcessHost::OnMessageReceived(const IPC::Message& message) {
   for (size_t i = 0; i < filters_.size(); ++i) {
     if (filters_[i]->OnMessageReceived(message))
       return;
   }
 
   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) ||
       mime_registry_dispatcher_->OnMessageReceived(message) ||
       MessagePortDispatcher::GetInstance()->OnMessageReceived(
           message, this, next_route_id_callback_.get(), &msg_is_ok);
 
   if (!handled) {
     handled = true;
     IPC_BEGIN_MESSAGE_MAP_EX(WorkerProcessHost, message, msg_is_ok)
@@ skipping 43 matching lines @@
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnChannelConnected(peer_pid);
 }
 
 void WorkerProcessHost::OnChannelError() {
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnChannelError();
 }
 
 void WorkerProcessHost::OnProcessLaunched() {
-  db_dispatcher_host_->Init(handle());
   file_system_dispatcher_host_->Init(handle());
   file_utilities_dispatcher_host_->Init(handle());
 }
 
 CallbackWithReturnValue<int>::Type* WorkerProcessHost::GetNextRouteIdCallback(
     IPC::Message::Sender* sender) {
   // We don't keep callbacks for senders associated with workers, so figure out
   // what kind of sender this is, and cast it to the correct class to get the
   // callback.
   for (BrowserChildProcessHost::Iterator iter(ChildProcessInfo::WORKER_PROCESS);
@@ skipping 335 matching lines @@
     }
   }
   return false;
 }
 
 WorkerProcessHost::WorkerInstance::SenderInfo
 WorkerProcessHost::WorkerInstance::GetSender() const {
   DCHECK(NumSenders() == 1);
   return *senders_.begin();
 }