Switch a bunch of remaining filters to derive from BrowserMessageFilters so t...

chrome/browser/mime_registry_message_filter.cc

Index: chrome/browser/mime_registry_message_filter.cc
===================================================================
--- chrome/browser/mime_registry_message_filter.cc	(revision 68877)
+++ chrome/browser/mime_registry_message_filter.cc	(working copy)
@@ -2,95 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mime_registry_dispatcher.h"
+#include "chrome/browser/mime_registry_message_filter.h"
 
-#include "chrome/browser/browser_thread.h"
-#include "chrome/common/render_messages.h"
+#include "chrome/common/mime_registry_messages.h"
 #include "net/base/mime_util.h"
 
-MimeRegistryDispatcher::MimeRegistryDispatcher(IPC::Message::Sender* sender)
-    : message_sender_(sender) {
-  DCHECK(message_sender_);
+MimeRegistryMessageFilter::MimeRegistryMessageFilter() {
 }
 
-MimeRegistryDispatcher::~MimeRegistryDispatcher() {
+MimeRegistryMessageFilter::~MimeRegistryMessageFilter() {
 }
 
-void MimeRegistryDispatcher::Shutdown() {
-  message_sender_ = NULL;
+void MimeRegistryMessageFilter::OverrideThreadForMessage(
+    const IPC::Message& message,
+    BrowserThread::ID* thread) {
+  if (IPC_MESSAGE_CLASS(message) == MimeRegistryMsgStart)
+    *thread = BrowserThread::FILE;
 }
 
-bool MimeRegistryDispatcher::OnMessageReceived(const IPC::Message& message) {
-  // On Windows MIME registry requests may access the Windows Registry so
-  // they need to run on the FILE thread.
-  if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
-    // Return false if the message is not for us.
-    if (message.type() != ViewHostMsg_GetMimeTypeFromExtension::ID &&
-        message.type() != ViewHostMsg_GetMimeTypeFromFile::ID &&
-        message.type() != ViewHostMsg_GetPreferredExtensionForMimeType::ID)
-     return false;
-
-    BrowserThread::PostTask(
-        BrowserThread::FILE, FROM_HERE,
-        NewRunnableMethod(
-            this, &MimeRegistryDispatcher::OnMessageReceived, message));
-    return true;
-  }
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
+bool MimeRegistryMessageFilter::OnMessageReceived(const IPC::Message& message,
+                                                  bool* message_was_ok) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(MimeRegistryDispatcher, message)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetMimeTypeFromExtension,
-                                    OnGetMimeTypeFromExtension)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetMimeTypeFromFile,
-                                    OnGetMimeTypeFromFile)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(
-        ViewHostMsg_GetPreferredExtensionForMimeType,
-        OnGetPreferredExtensionForMimeType)
-    IPC_MESSAGE_UNHANDLED((handled = false))
+  IPC_BEGIN_MESSAGE_MAP_EX(MimeRegistryMessageFilter, message, *message_was_ok)
+    IPC_MESSAGE_HANDLER(MimeRegistryMsg_GetMimeTypeFromExtension,
+                        OnGetMimeTypeFromExtension)
+    IPC_MESSAGE_HANDLER(MimeRegistryMsg_GetMimeTypeFromFile,
+                        OnGetMimeTypeFromFile)
+    IPC_MESSAGE_HANDLER(MimeRegistryMsg_GetPreferredExtensionForMimeType,
+                        OnGetPreferredExtensionForMimeType)
+    IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void MimeRegistryDispatcher::OnGetMimeTypeFromExtension(
-    const FilePath::StringType& ext, IPC::Message* reply_msg) {
-  std::string mime_type;
-  net::GetMimeTypeFromExtension(ext, &mime_type);
-  ViewHostMsg_GetMimeTypeFromExtension::WriteReplyParams(reply_msg, mime_type);
-  Send(reply_msg);
+void MimeRegistryMessageFilter::OnGetMimeTypeFromExtension(
+    const FilePath::StringType& ext, std::string* mime_type) {
+  net::GetMimeTypeFromExtension(ext, mime_type);
 }
 
-void MimeRegistryDispatcher::OnGetMimeTypeFromFile(
-    const FilePath& file_path, IPC::Message* reply_msg) {
-  std::string mime_type;
-  net::GetMimeTypeFromFile(file_path, &mime_type);
-  ViewHostMsg_GetMimeTypeFromFile::WriteReplyParams(reply_msg, mime_type);
-  Send(reply_msg);
+void MimeRegistryMessageFilter::OnGetMimeTypeFromFile(
+    const FilePath& file_path, std::string* mime_type) {
+  net::GetMimeTypeFromFile(file_path, mime_type);
 }
 
-void MimeRegistryDispatcher::OnGetPreferredExtensionForMimeType(
-    const std::string& mime_type, IPC::Message* reply_msg) {
-  FilePath::StringType ext;
-  net::GetPreferredExtensionForMimeType(mime_type, &ext);
-  ViewHostMsg_GetPreferredExtensionForMimeType::WriteReplyParams(
-      reply_msg, ext);
-  Send(reply_msg);
+void MimeRegistryMessageFilter::OnGetPreferredExtensionForMimeType(
+    const std::string& mime_type, FilePath::StringType* extension) {
+  net::GetPreferredExtensionForMimeType(mime_type, extension);
 }
-
-void MimeRegistryDispatcher::Send(IPC::Message* message) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    if (!BrowserThread::PostTask(
-            BrowserThread::IO, FROM_HERE, NewRunnableMethod(
-                this, &MimeRegistryDispatcher::Send, message))) {
-      // The IO thread is dead.
-      delete message;
-    }
-    return;
-  }
-
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (message_sender_)
-    message_sender_->Send(message);
-  else
-    delete message;
-}