Merge 60513 - Fix the problem that BlobDispatcherHost is not hooked up in Wor...

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 60523)
+++ chrome/browser/worker_host/worker_process_host.cc	(working copy)
@@ -18,6 +18,7 @@
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/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/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ -63,7 +64,10 @@
     : BrowserChildProcessHost(WORKER_PROCESS, resource_dispatcher_host),
       request_context_(request_context),
       appcache_dispatcher_host_(
-          new AppCacheDispatcherHost(request_context)) {
+          new AppCacheDispatcherHost(request_context)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(blob_dispatcher_host_(
+          new BlobDispatcherHost(
+              this->id(), request_context->blob_storage_context()))) {
   next_route_id_callback_.reset(NewCallbackWithReturnValue(
       WorkerService::GetInstance(), &WorkerService::next_worker_route_id));
   db_dispatcher_host_ = new DatabaseDispatcherHost(
@@ -76,6 +80,9 @@
   // Shut down the database dispatcher host.
   db_dispatcher_host_->Shutdown();
 
+  // Shut down the blob dispatcher host.
+  blob_dispatcher_host_->Shutdown();
+
   // Let interested observers know we are being deleted.
   NotificationService::current()->Notify(
       NotificationType::WORKER_PROCESS_HOST_SHUTDOWN,
@@ -236,6 +243,7 @@
   bool handled =
       appcache_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
       db_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
+      blob_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
       MessagePortDispatcher::GetInstance()->OnMessageReceived(
           message, this, next_route_id_callback_.get(), &msg_is_ok);