diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 01:12:24 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 01:12:24 +0000 |
| commit | 97c652b98f92e060e3ed3a11d2c808d85a7e1c1c (patch) | |
| tree | 869d2ba677905ea0cba67f4ee311d15846f97790 /ipc/ipc_tests.cc | |
| parent | 31ad4a24b884526a51f81efa556c019dcc27657d (diff) | |
| download | chromium_src-97c652b98f92e060e3ed3a11d2c808d85a7e1c1c.zip chromium_src-97c652b98f92e060e3ed3a11d2c808d85a7e1c1c.tar.gz chromium_src-97c652b98f92e060e3ed3a11d2c808d85a7e1c1c.tar.bz2 | |
Make GlobalDescriptors::MaybeGet return -1 when the key is not found.
BUG=None
TEST=Unit tests should still pass.
Review URL: https://chromiumcodereview.appspot.com/10387218
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_tests.cc')
| -rw-r--r-- | ipc/ipc_tests.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc index 763a592..fc2de57 100644 --- a/ipc/ipc_tests.cc +++ b/ipc/ipc_tests.cc @@ -28,6 +28,7 @@ #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_message_utils.h" +#include "ipc/ipc_multiprocess_test.h" #include "ipc/ipc_sender.h" #include "ipc/ipc_switches.h" #include "testing/multiprocess_func_list.h" @@ -402,7 +403,7 @@ TEST_F(IPCChannelTest, MAYBE_SendMessageInChannelConnected) { base::CloseProcessHandle(process_handle); } -MULTIPROCESS_TEST_MAIN(RunTestClient) { +MULTIPROCESS_IPC_TEST_MAIN(RunTestClient) { MessageLoopForIO main_message_loop; MyChannelListener channel_listener; @@ -572,7 +573,7 @@ TEST_F(IPCChannelTest, Performance) { } // This message loop bounces all messages back to the sender -MULTIPROCESS_TEST_MAIN(RunReflector) { +MULTIPROCESS_IPC_TEST_MAIN(RunReflector) { MessageLoopForIO main_message_loop; IPC::Channel chan(kReflectorChannel, IPC::Channel::MODE_CLIENT, NULL); ChannelReflectorListener channel_reflector_listener(&chan); |