Make the AppCacheDispatcherHost be a MessageFilter so that ResourceMessageFil...

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"
@@ skipping 51 matching lines @@
  private:
   int render_process_unique_id_;
   int render_view_id_;
 };
 
 WorkerProcessHost::WorkerProcessHost(
     ResourceDispatcherHost* resource_dispatcher_host,
     ChromeURLRequestContext *request_context)
     : BrowserChildProcessHost(WORKER_PROCESS, resource_dispatcher_host),
       request_context_(request_context),
-      appcache_dispatcher_host_(
-          new AppCacheDispatcherHost(request_context)),
       ALLOW_THIS_IN_INITIALIZER_LIST(blob_dispatcher_host_(
           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());
-  appcache_dispatcher_host_->Initialize(this);
 }
 
 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.
@@ skipping 106 matching lines @@
           base::PLATFORM_FILE_CREATE_ALWAYS |
           base::PLATFORM_FILE_READ |
           base::PLATFORM_FILE_WRITE |
           base::PLATFORM_FILE_EXCLUSIVE_READ |
           base::PLATFORM_FILE_EXCLUSIVE_WRITE |
           base::PLATFORM_FILE_ASYNC |
           base::PLATFORM_FILE_TRUNCATE |
           base::PLATFORM_FILE_WRITE_ATTRIBUTES);
   }
 
+  CreateMessageFilters();
+
   return true;
 }
 
+void WorkerProcessHost::CreateMessageFilters() {
+  filters_.push_back(new AppCacheDispatcherHost(request_context_, id()));

[jennb, 2010/12/04 00:31:51]

I'm guessing you're switching the other dispatcher hosts to filters in separate
CLs?

+
+  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);
 
   WorkerProcessMsg_CreateWorker_Params params;
   params.url = instance.url();
   params.is_shared = instance.shared();
   params.name = instance.name();
@@ skipping 42 matching lines @@
       // Set the closed flag - this will stop any further messages from
       // being sent to the worker (messages can still be sent from the worker,
       // for exception reporting, etc).
       i->set_closed(true);
       break;
     }
   }
 }
 
 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 =
-      appcache_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
       db_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||

[jennb, 2010/12/04 00:31:51]

Will all these also become filters eventually?

       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 32 matching lines @@
 
       if (message.type() == WorkerHostMsg_WorkerContextDestroyed::ID) {
         instances_.erase(i);
         UpdateTitle();
       }
       break;
     }
   }
 }
 
+void WorkerProcessHost::OnChannelConnected(int32 peer_pid) {
+  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
@@ skipping 337 matching lines @@
     }
   }
   return false;
 }
 
 WorkerProcessHost::WorkerInstance::SenderInfo
 WorkerProcessHost::WorkerInstance::GetSender() const {
   DCHECK(NumSenders() == 1);
   return *senders_.begin();
 }