Make GlobalDescriptors::MaybeGet return -1 when the key is not found.

ipc/ipc_tests.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <sys/types.h>
@@ skipping 14 matching lines @@
 #include "base/test/test_suite.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/ipc_switches.h"
 #include "testing/multiprocess_func_list.h"
 
+#if defined(OS_POSIX)
+#include "base/global_descriptors_posix.h"
+#include "ipc/ipc_descriptors.h"
+#endif
+
 // Define to enable IPC performance testing instead of the regular unit tests
 // #define PERFORMANCE_TEST
 
 const char kTestClientChannel[] = "T1";
 const char kReflectorChannel[] = "T2";
 const char kFuzzerChannel[] = "F3";
 const char kSyncSocketChannel[] = "S4";
 
 const size_t kLongMessageStringNumBytes = 50000;
 
 #ifndef PERFORMANCE_TEST
 
+int MultiProcessTestIPCSetUp() {
+#if defined(OS_POSIX)
+  base::GlobalDescriptors::GetInstance()->Set(kPrimaryIPCChannel,
+      kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
+#endif
+  return 0;
+}
+
 void IPCChannelTest::SetUp() {
   MultiProcessTest::SetUp();
 
   // Construct a fresh IO Message loop for the duration of each test.
   message_loop_ = new MessageLoopForIO();
 }
 
 void IPCChannelTest::TearDown() {
   delete message_loop_;
   message_loop_ = NULL;
@@ skipping 338 matching lines @@
   MessageLoop::current()->Run();
 
   // Close Channel so client gets its OnChannelError() callback fired.
   channel.Close();
 
   // Cleanup child process.
   EXPECT_TRUE(base::WaitForSingleProcess(process_handle, 5000));
   base::CloseProcessHandle(process_handle);
 }
 
-MULTIPROCESS_TEST_MAIN(RunTestClient) {
+MULTIPROCESS_IPC_TEST_MAIN(RunTestClient) {
   MessageLoopForIO main_message_loop;
   MyChannelListener channel_listener;
 
   // setup IPC channel
   IPC::Channel chan(kTestClientChannel, IPC::Channel::MODE_CLIENT,
                     &channel_listener);
   CHECK(chan.Connect());
   channel_listener.Init(&chan);
   Send(&chan, "hello from child");
   // run message loop
@@ skipping 149 matching lines @@
 
   // run message loop
   MessageLoop::current()->Run();
 
   // cleanup child process
   WaitForSingleObject(process, 5000);
   CloseHandle(process);
 }
 
 // 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);
   chan.set_listener(&channel_reflector_listener);
   ASSERT_TRUE(chan.Connect());
 
   MessageLoop::current()->Run();
   return true;
 }
 
 #endif  // PERFORMANCE_TEST
 
 int main(int argc, char** argv) {
 #ifdef PERFORMANCE_TEST
   int retval = base::PerfTestSuite(argc, argv).Run();
 #else
   int retval = base::TestSuite(argc, argv).Run();
 #endif
   return retval;
 }