Make IndexedDBDispatcherHost be a message filter and move its messages into a...

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 69028)
+++ chrome/browser/renderer_host/resource_message_filter.cc	(working copy)
@@ -26,7 +26,6 @@
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h"
-#include "chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 #include "chrome/browser/metrics/histogram_synchronizer.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
@@ -250,8 +249,6 @@
       render_widget_helper_(render_widget_helper),
       ALLOW_THIS_IN_INITIALIZER_LIST(dom_storage_dispatcher_host_(
           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()))),
@@ -285,9 +282,6 @@
   // Tell the DOM Storage dispatcher host to stop sending messages via us.
   dom_storage_dispatcher_host_->Shutdown();
 
-  // 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();
 
@@ -319,7 +313,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());
 }
 
@@ -346,11 +339,10 @@
   bool handled =
       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) ;
+      geolocation_dispatcher_host_->OnMessageReceived(msg, &msg_is_ok);
 
   if (!handled) {
     DCHECK(msg_is_ok);  // It should have been marked handled if it wasn't OK.