diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 21:29:33 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 21:29:33 +0000 |
commit | e44d13473dd9d81a8d3e1d26f2024be4e4a7c503 (patch) | |
tree | 4a66307f49ed83f6de7faba305cd6355a649b355 /components | |
parent | 51f81dae305d1bdfda139b18be3632f8fbf4959f (diff) | |
download | chromium_src-e44d13473dd9d81a8d3e1d26f2024be4e4a7c503.zip chromium_src-e44d13473dd9d81a8d3e1d26f2024be4e4a7c503.tar.gz chromium_src-e44d13473dd9d81a8d3e1d26f2024be4e4a7c503.tar.bz2 |
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
Diffstat (limited to 'components')
4 files changed, 7 insertions, 12 deletions
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; diff --git a/components/nacl/browser/nacl_host_message_filter.cc b/components/nacl/browser/nacl_host_message_filter.cc index 6ff43f5..a421061 100644 --- a/components/nacl/browser/nacl_host_message_filter.cc +++ b/components/nacl/browser/nacl_host_message_filter.cc @@ -37,10 +37,9 @@ void NaClHostMessageFilter::OnChannelClosing() { pnacl::PnaclHost::GetInstance()->RendererClosing(render_process_id_); } -bool NaClHostMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool NaClHostMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(NaClHostMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(NaClHostMessageFilter, message) #if !defined(DISABLE_NACL) IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_LaunchNaCl, OnLaunchNaCl) IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_GetReadonlyPnaclFD, diff --git a/components/nacl/browser/nacl_host_message_filter.h b/components/nacl/browser/nacl_host_message_filter.h index 0227409..b0e991a 100644 --- a/components/nacl/browser/nacl_host_message_filter.h +++ b/components/nacl/browser/nacl_host_message_filter.h @@ -34,8 +34,7 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter { net::URLRequestContextGetter* request_context); // content::BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnChannelClosing() OVERRIDE; int render_process_id() { return render_process_id_; } |