Remove IPC_BEGIN_MESSAGE_MAP_EX macro since r270839 made all bad IPCs kill their child processes.

components/cdm/browser/cdm_message_filter_android.cc

 // Copyright 2014 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 "components/cdm/browser/cdm_message_filter_android.h"
 
 #include <string>
 
 #include "components/cdm/common/cdm_messages_android.h"
 #include "ipc/ipc_message_macros.h"
@@ skipping 52 matching lines @@
   }
 
   return supported_codecs;
 }
 
 CdmMessageFilterAndroid::CdmMessageFilterAndroid()
     : BrowserMessageFilter(EncryptedMediaMsgStart) {}
 
 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;
 }
 
 void CdmMessageFilterAndroid::OverrideThreadForMessage(
     const IPC::Message& message, BrowserThread::ID* thread) {
   // Move the IPC handling to FILE thread as it is not very cheap.
   if (message.type() == ChromeViewHostMsg_GetSupportedKeySystems::ID)
     *thread = BrowserThread::FILE;
 }
 
@@ skipping 14 matching lines @@
     return;
 
   DCHECK(request.codecs & content::EME_CODEC_ALL) << "unrecognized codec";
   response->key_system = request.key_system;
   // TODO(qinmin): check composition is supported or not.
   response->compositing_codecs = GetSupportedCodecs(request, true);
   response->non_compositing_codecs = GetSupportedCodecs(request, false);
 }
 
 }  // namespace cdm