From 787f5e460f6265f961f88b75391edeb6eeb8a720 Mon Sep 17 00:00:00 2001 From: "benwells@chromium.org" Date: Fri, 11 Oct 2013 04:22:34 +0000 Subject: Revert 227999 "Alternative workaround for mac kernel bug." > Alternative workaround for mac kernel bug. > > BUG=298276 > > Review URL: https://codereview.chromium.org/25325002 This change seemed to cause the Mac ASAN bot to timeout when running the ipc_tests. TBR=hubbe@chromium.org Review URL: https://codereview.chromium.org/26384003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228110 0039d316-1c4b-4281-b951-d872f2087c98 --- ipc/ipc_channel_reader.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'ipc/ipc_channel_reader.cc') diff --git a/ipc/ipc_channel_reader.cc b/ipc/ipc_channel_reader.cc index 2ee7449..9055deb 100644 --- a/ipc/ipc_channel_reader.cc +++ b/ipc/ipc_channel_reader.cc @@ -38,15 +38,9 @@ bool ChannelReader::AsyncReadComplete(int bytes_read) { return DispatchInputData(input_buf_, bytes_read); } -bool ChannelReader::IsInternalMessage(const Message& m) const { - return m.routing_id() == MSG_ROUTING_NONE && - m.type() >= Channel::CLOSE_FD_MESSAGE_TYPE && - m.type() <= Channel::HELLO_MESSAGE_TYPE; -} - bool ChannelReader::IsHelloMessage(const Message& m) const { return m.routing_id() == MSG_ROUTING_NONE && - m.type() == Channel::HELLO_MESSAGE_TYPE; + m.type() == Channel::HELLO_MESSAGE_TYPE; } bool ChannelReader::DispatchInputData(const char* input_data, @@ -90,8 +84,8 @@ bool ChannelReader::DispatchInputData(const char* input_data, "line", IPC_MESSAGE_ID_LINE(m.type())); #endif m.TraceMessageEnd(); - if (IsInternalMessage(m)) - HandleInternalMessage(m); + if (IsHelloMessage(m)) + HandleHelloMessage(m); else listener_->OnMessageReceived(m); p = message_tail; -- cgit v1.1