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 --- components/cdm/browser/cdm_message_filter_android.cc | 8 +++----- components/cdm/browser/cdm_message_filter_android.h | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'components/cdm') diff --git a/components/cdm/browser/cdm_message_filter_android.cc b/components/cdm/browser/cdm_message_filter_android.cc index 82dac5e..2bda860 100644 --- a/components/cdm/browser/cdm_message_filter_android.cc +++ b/components/cdm/browser/cdm_message_filter_android.cc @@ -70,15 +70,13 @@ CdmMessageFilterAndroid::CdmMessageFilterAndroid() CdmMessageFilterAndroid::~CdmMessageFilterAndroid() {} -bool CdmMessageFilterAndroid::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { +bool CdmMessageFilterAndroid::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX( - CdmMessageFilterAndroid, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(CdmMessageFilterAndroid, message) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_GetSupportedKeySystems, OnGetSupportedKeySystems) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/components/cdm/browser/cdm_message_filter_android.h b/components/cdm/browser/cdm_message_filter_android.h index b639fa8..47aa445 100644 --- a/components/cdm/browser/cdm_message_filter_android.h +++ b/components/cdm/browser/cdm_message_filter_android.h @@ -24,8 +24,7 @@ class CdmMessageFilterAndroid virtual ~CdmMessageFilterAndroid(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; -- cgit v1.1