summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_sync_message_unittest.h
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 20:07:53 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 20:07:53 +0000
commit9134cce6dc08d7e5962c228ecc1c5a1244e233ae (patch)
tree68732b438b0db89b94ae2436d7f46d40313155f5 /ipc/ipc_sync_message_unittest.h
parent91eb959385f07cf38b90f26ec3be4499b1f264ea (diff)
downloadchromium_src-9134cce6dc08d7e5962c228ecc1c5a1244e233ae.zip
chromium_src-9134cce6dc08d7e5962c228ecc1c5a1244e233ae.tar.gz
chromium_src-9134cce6dc08d7e5962c228ecc1c5a1244e233ae.tar.bz2
ipc: don't treat replies with the unblock flag set as regular messages
Old behavior would test should_unblock() before is_reply() so if both were set but TryToUnblockListener wouldn't return true (the corresponding Send isn't on top of the stack), it would queue the message as to be dispatched. This restores the correct order. BUG=122443 TEST=ipc_tests, in particular ReentrantReply Review URL: http://codereview.chromium.org/9960058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_sync_message_unittest.h')
-rw-r--r--ipc/ipc_sync_message_unittest.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/ipc/ipc_sync_message_unittest.h b/ipc/ipc_sync_message_unittest.h
index 66a7876..114aca6 100644
--- a/ipc/ipc_sync_message_unittest.h
+++ b/ipc/ipc_sync_message_unittest.h
@@ -113,3 +113,8 @@ IPC_SYNC_MESSAGE_ROUTED3_4(Msg_R_3_4, bool, int, std::string, int, bool,
IPC_MESSAGE_CONTROL1(SyncChannelTestMsg_Ping, int)
IPC_SYNC_MESSAGE_CONTROL1_1(SyncChannelTestMsg_PingTTL, int, int)
IPC_SYNC_MESSAGE_CONTROL0_0(SyncChannelTestMsg_Done)
+
+// Messages for ReentrantReply test.
+IPC_SYNC_MESSAGE_CONTROL0_0(SyncChannelTestMsg_Reentrant1)
+IPC_SYNC_MESSAGE_CONTROL0_0(SyncChannelTestMsg_Reentrant2)
+IPC_SYNC_MESSAGE_CONTROL0_0(SyncChannelTestMsg_Reentrant3)