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

content/browser/renderer_host/websocket_dispatcher_host_unittest.cc

 // Copyright 2013 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 "content/browser/renderer_host/websocket_dispatcher_host.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 13 matching lines @@
 class MockWebSocketHost : public WebSocketHost {
  public:
   MockWebSocketHost(int routing_id,
                     WebSocketDispatcherHost* dispatcher,
                     net::URLRequestContext* url_request_context)
       : WebSocketHost(routing_id, dispatcher, url_request_context) {
   }
 
   virtual ~MockWebSocketHost() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok) OVERRIDE{
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE{
     received_messages_.push_back(message);
     return true;
   }
 
   std::vector<IPC::Message> received_messages_;
 };
 
 class WebSocketDispatcherHostTest : public ::testing::Test {
  public:
   WebSocketDispatcherHostTest() {
@@ skipping 25 matching lines @@
     mock_hosts_.push_back(host);
     return host;
   }
 };
 
 TEST_F(WebSocketDispatcherHostTest, Construct) {
   // Do nothing.
 }
 
 TEST_F(WebSocketDispatcherHostTest, UnrelatedMessage) {
-  bool message_was_ok = false;
   IPC::Message message;
-  EXPECT_FALSE(dispatcher_host_->OnMessageReceived(message, &message_was_ok));
+  EXPECT_FALSE(dispatcher_host_->OnMessageReceived(message));
 }
 
 TEST_F(WebSocketDispatcherHostTest, AddChannelRequest) {
   int routing_id = 123;
   GURL socket_url("ws://example.com/test");
   std::vector<std::string> requested_protocols;
   requested_protocols.push_back("hello");
   url::Origin origin("http://example.com/test");
   WebSocketHostMsg_AddChannelRequest message(
       routing_id, socket_url, requested_protocols, origin);
 
-  bool message_was_ok = false;
-  ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message, &message_was_ok));
+  ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message));
 
   ASSERT_EQ(1U, mock_hosts_.size());
   MockWebSocketHost* host = mock_hosts_[0];
 
   ASSERT_EQ(1U, host->received_messages_.size());
   const IPC::Message& forwarded_message = host->received_messages_[0];
   EXPECT_EQ(WebSocketHostMsg_AddChannelRequest::ID, forwarded_message.type());
   EXPECT_EQ(routing_id, forwarded_message.routing_id());
 }
 
 TEST_F(WebSocketDispatcherHostTest, SendFrameButNoHostYet) {
   int routing_id = 123;
   std::vector<char> data;
   WebSocketMsg_SendFrame message(
       routing_id, true, WEB_SOCKET_MESSAGE_TYPE_TEXT, data);
 
-  bool message_was_ok = false;
   // Expected to be ignored.
-  EXPECT_TRUE(dispatcher_host_->OnMessageReceived(message, &message_was_ok));
+  EXPECT_TRUE(dispatcher_host_->OnMessageReceived(message));
 
   EXPECT_EQ(0U, mock_hosts_.size());
 }
 
 TEST_F(WebSocketDispatcherHostTest, SendFrame) {
   int routing_id = 123;
 
   GURL socket_url("ws://example.com/test");
   std::vector<std::string> requested_protocols;
   requested_protocols.push_back("hello");
   url::Origin origin("http://example.com/test");
   WebSocketHostMsg_AddChannelRequest add_channel_message(
       routing_id, socket_url, requested_protocols, origin);
 
-  bool message_was_ok = false;
-
-  ASSERT_TRUE(dispatcher_host_->OnMessageReceived(
-      add_channel_message, &message_was_ok));
+  ASSERT_TRUE(dispatcher_host_->OnMessageReceived(add_channel_message));
 
   std::vector<char> data;
   WebSocketMsg_SendFrame send_frame_message(
       routing_id, true, WEB_SOCKET_MESSAGE_TYPE_TEXT, data);
 
-  EXPECT_TRUE(dispatcher_host_->OnMessageReceived(
-      send_frame_message, &message_was_ok));
+  EXPECT_TRUE(dispatcher_host_->OnMessageReceived(send_frame_message));
 
   ASSERT_EQ(1U, mock_hosts_.size());
   MockWebSocketHost* host = mock_hosts_[0];
 
   ASSERT_EQ(2U, host->received_messages_.size());
   {
     const IPC::Message& forwarded_message = host->received_messages_[0];
     EXPECT_EQ(WebSocketHostMsg_AddChannelRequest::ID, forwarded_message.type());
     EXPECT_EQ(routing_id, forwarded_message.routing_id());
   }
   {
     const IPC::Message& forwarded_message = host->received_messages_[1];
     EXPECT_EQ(WebSocketMsg_SendFrame::ID, forwarded_message.type());
     EXPECT_EQ(routing_id, forwarded_message.routing_id());
   }
 }
 
 }  // namespace
 }  // namespace content