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

ipc/ipc_send_fds_test.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"
 
 #include "ipc/ipc_tests.h"
 
 #if defined(OS_MACOSX)
 extern "C" {
 #include <sandbox.h>
 }
 #endif
 #include <fcntl.h>
 #include <sys/stat.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/message_loop.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message_utils.h"
 #include "testing/multiprocess_func_list.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
+#include "base/global_descriptors_posix.h"
+#include "ipc/ipc_descriptors.h"
 
 namespace {
 
 const unsigned kNumFDsToSend = 20;
 const char* kDevZeroPath = "/dev/zero";
 
 static void VerifyAndCloseDescriptor(int fd, ino_t inode_num) {
   // Check that we can read from the FD.
   char buf;
   ssize_t amt_read = read(fd, &buf, 1);
@@ skipping 90 matching lines @@
   CHECK(listener.GotExpectedNumberOfDescriptors());
 
   return 0;
 }
 
 }  // namespace
 
 // ---------------------------------------------------------------------------
 #if defined(OS_MACOSX)
 // TODO(port): Make this test cross-platform.
-MULTIPROCESS_TEST_MAIN(RunTestDescriptorClientSandboxed) {
+MULTIPROCESS_TEST_MAIN(RunTestDescriptorClientSandboxed,
+                       MultiProcessTestIPCSetUp) {
   struct stat st;
   const int fd = open(kDevZeroPath, O_RDONLY);
   fstat(fd, &st);
   if (HANDLE_EINTR(close(fd)) < 0) {
     return -1;
   }
 
   // Enable the Sandbox.
   char* error_buff = NULL;
   int error = sandbox_init(kSBXProfilePureComputation, SANDBOX_NAMED,
@@ skipping 24 matching lines @@
                     &listener);
   ASSERT_TRUE(chan.Connect());
 
   base::ProcessHandle process_handle = SpawnChild(
       TEST_DESCRIPTOR_CLIENT_SANDBOXED,
       &chan);
   TestDescriptorServer(chan, process_handle);
 }
 #endif  // defined(OS_MACOSX)
 
-MULTIPROCESS_TEST_MAIN(RunTestDescriptorClient) {
+MULTIPROCESS_TEST_MAIN(RunTestDescriptorClient, MultiProcessTestIPCSetUp) {
   struct stat st;
   const int fd = open(kDevZeroPath, O_RDONLY);
   fstat(fd, &st);
   EXPECT_GE(HANDLE_EINTR(close(fd)), 0);
 
   return TestDescriptorClient(st.st_ino);
 }
 
 TEST_F(IPCChannelTest, DescriptorTest) {
     // Setup IPC channel.
   MyChannelDescriptorListener listener(-1);
 
   IPC::Channel chan(kTestClientChannel, IPC::Channel::MODE_SERVER,
                     &listener);
   ASSERT_TRUE(chan.Connect());
 
   base::ProcessHandle process_handle = SpawnChild(TEST_DESCRIPTOR_CLIENT,
                                                   &chan);
   TestDescriptorServer(chan, process_handle);
 }
 
 #endif  // defined(OS_POSIX)