From e44d13473dd9d81a8d3e1d26f2024be4e4a7c503 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 16 May 2014 21:29:33 +0000 Subject: Remove IPC_BEGIN_MESSAGE_MAP_EX macro since r270839 made all bad IPCs kill their child processes. R=avi@chromium.org Review URL: https://codereview.chromium.org/292443004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271096 0039d316-1c4b-4281-b951-d872f2087c98 --- extensions/browser/extension_message_filter.cc | 5 ++--- extensions/browser/extension_message_filter.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'extensions') diff --git a/extensions/browser/extension_message_filter.cc b/extensions/browser/extension_message_filter.cc index 2fd31bf..3cf93f0 100644 --- a/extensions/browser/extension_message_filter.cc +++ b/extensions/browser/extension_message_filter.cc @@ -51,10 +51,9 @@ void ExtensionMessageFilter::OverrideThreadForMessage( } } -bool ExtensionMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ExtensionMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ExtensionMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ExtensionMessageFilter, message) IPC_MESSAGE_HANDLER(ExtensionHostMsg_AddListener, OnExtensionAddListener) IPC_MESSAGE_HANDLER(ExtensionHostMsg_RemoveListener, diff --git a/extensions/browser/extension_message_filter.h b/extensions/browser/extension_message_filter.h index da2bff2..26060c5 100644 --- a/extensions/browser/extension_message_filter.h +++ b/extensions/browser/extension_message_filter.h @@ -43,8 +43,7 @@ class ExtensionMessageFilter : public content::BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Message handlers on the UI thread. void OnExtensionAddListener(const std::string& extension_id, -- cgit v1.1