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

4 files changed, 8 insertions, 17 deletions

diff --git a/content/browser/device_sensors/device_motion_message_filter.cc b/content/browser/device_sensors/device_motion_message_filter.cc
index 26a3962..2994c38 100644
--- a/content/browser/device_sensors/device_motion_message_filter.cc
+++ b/content/browser/device_sensors/device_motion_message_filter.cc
@@ -21,19 +21,15 @@ DeviceMotionMessageFilter::~DeviceMotionMessageFilter() {
         CONSUMER_TYPE_MOTION);
 }
 
-bool DeviceMotionMessageFilter::OnMessageReceived(
-    const IPC::Message& message,
-    bool* message_was_ok) {
+bool DeviceMotionMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP_EX(DeviceMotionMessageFilter,
-                           message,
-                           *message_was_ok)
+  IPC_BEGIN_MESSAGE_MAP(DeviceMotionMessageFilter, message)
     IPC_MESSAGE_HANDLER(DeviceMotionHostMsg_StartPolling,
                         OnDeviceMotionStartPolling)
     IPC_MESSAGE_HANDLER(DeviceMotionHostMsg_StopPolling,
                         OnDeviceMotionStopPolling)
     IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP_EX()
+  IPC_END_MESSAGE_MAP()
   return handled;
 }
 
diff --git a/content/browser/device_sensors/device_motion_message_filter.h b/content/browser/device_sensors/device_motion_message_filter.h
index 5bbce9b..71ba38c2 100644
--- a/content/browser/device_sensors/device_motion_message_filter.h
+++ b/content/browser/device_sensors/device_motion_message_filter.h
@@ -18,8 +18,7 @@ class DeviceMotionMessageFilter : public BrowserMessageFilter {
   DeviceMotionMessageFilter();
 
   // BrowserMessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   virtual ~DeviceMotionMessageFilter();
diff --git a/content/browser/device_sensors/device_orientation_message_filter.cc b/content/browser/device_sensors/device_orientation_message_filter.cc
index 622c685..402aa67 100644
--- a/content/browser/device_sensors/device_orientation_message_filter.cc
+++ b/content/browser/device_sensors/device_orientation_message_filter.cc
@@ -22,18 +22,15 @@ DeviceOrientationMessageFilter::~DeviceOrientationMessageFilter() {
 }
 
 bool DeviceOrientationMessageFilter::OnMessageReceived(
-    const IPC::Message& message,
-    bool* message_was_ok) {
+    const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP_EX(DeviceOrientationMessageFilter,
-                           message,
-                           *message_was_ok)
+  IPC_BEGIN_MESSAGE_MAP(DeviceOrientationMessageFilter, message)
     IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StartPolling,
                         OnDeviceOrientationStartPolling)
     IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StopPolling,
                         OnDeviceOrientationStopPolling)
     IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP_EX()
+  IPC_END_MESSAGE_MAP()
   return handled;
 }
 
diff --git a/content/browser/device_sensors/device_orientation_message_filter.h b/content/browser/device_sensors/device_orientation_message_filter.h
index afc3ec2..6d99405 100644
--- a/content/browser/device_sensors/device_orientation_message_filter.h
+++ b/content/browser/device_sensors/device_orientation_message_filter.h
@@ -17,8 +17,7 @@ class DeviceOrientationMessageFilter : public BrowserMessageFilter {
   DeviceOrientationMessageFilter();
 
   // BrowserMessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   virtual ~DeviceOrientationMessageFilter();