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

base/process_util_unittest.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.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 101 matching lines @@
 }  // namespace
 
 class ProcessUtilTest : public base::MultiProcessTest {
 #if defined(OS_POSIX)
  public:
   // Spawn a child process that counts how many file descriptors are open.
   int CountOpenFDsInChild();
 #endif
 };
 
-MULTIPROCESS_TEST_MAIN(SimpleChildProcess) {
+MULTIPROCESS_TEST_MAIN(SimpleChildProcess, NULL) {
   return 0;
 }
 
 TEST_F(ProcessUtilTest, SpawnChild) {
   base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
   EXPECT_TRUE(base::WaitForSingleProcess(
                   handle, TestTimeouts::action_max_timeout_ms()));
   base::CloseProcessHandle(handle);
 }
 
-MULTIPROCESS_TEST_MAIN(SlowChildProcess) {
+MULTIPROCESS_TEST_MAIN(SlowChildProcess, NULL) {
   WaitToDie(kSignalFileSlow);
   return 0;
 }
 
 TEST_F(ProcessUtilTest, KillSlowChild) {
   remove(kSignalFileSlow);
   base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
   SignalChildren(kSignalFileSlow);
   EXPECT_TRUE(base::WaitForSingleProcess(
@@ skipping 59 matching lines @@
 #if !defined(OS_MACOSX)
 // This test is disabled on Mac, since it's flaky due to ReportCrash
 // taking a variable amount of time to parse and load the debug and
 // symbol data for this unit test's executable before firing the
 // signal handler.
 //
 // TODO(gspencer): turn this test process into a very small program
 // with no symbols (instead of using the multiprocess testing
 // framework) to reduce the ReportCrash overhead.
 
-MULTIPROCESS_TEST_MAIN(CrashingChildProcess) {
+MULTIPROCESS_TEST_MAIN(CrashingChildProcess, NULL) {
   WaitToDie(kSignalFileCrash);
 #if defined(OS_POSIX)
   // Have to disable to signal handler for segv so we can get a crash
   // instead of an abnormal termination through the crash dump handler.
   ::signal(SIGSEGV, SIG_DFL);
 #endif
   // Make this process have a segmentation fault.
   volatile int* oops = NULL;
   *oops = 0xDEAD;
   return 1;
@@ skipping 32 matching lines @@
   EXPECT_EQ(SIGSEGV, signal);
 #endif
   base::CloseProcessHandle(handle);
 
   // Reset signal handlers back to "normal".
   base::EnableInProcessStackDumping();
   remove(kSignalFileCrash);
 }
 #endif  // !defined(OS_MACOSX)
 
-MULTIPROCESS_TEST_MAIN(KilledChildProcess) {
+MULTIPROCESS_TEST_MAIN(KilledChildProcess, NULL) {
   WaitToDie(kSignalFileKill);
 #if defined(OS_WIN)
   // Kill ourselves.
   HANDLE handle = ::OpenProcess(PROCESS_ALL_ACCESS, 0, ::GetCurrentProcessId());
   ::TerminateProcess(handle, kExpectedKilledExitCode);
 #elif defined(OS_POSIX)
   // Send a SIGKILL to this process, just like the OOM killer would.
   ::kill(getpid(), SIGKILL);
 #endif
   return 1;
@@ skipping 237 matching lines @@
     return max_int;
   }
 
   return rlim.rlim_cur;
 }
 
 const int kChildPipe = 20;  // FD # for write end of pipe in child process.
 
 }  // namespace
 
-MULTIPROCESS_TEST_MAIN(ProcessUtilsLeakFDChildProcess) {
+MULTIPROCESS_TEST_MAIN(ProcessUtilsLeakFDChildProcess, NULL) {
   // This child process counts the number of open FDs, it then writes that
   // number out to a pipe connected to the parent.
   int num_open_files = 0;
   int write_pipe = kChildPipe;
   int max_files = GetMaxFilesOpenInProcess();
   for (int i = STDERR_FILENO + 1; i < max_files; i++) {
     if (i != kChildPipe) {
       int fd;
       if ((fd = HANDLE_EINTR(dup(i))) != -1) {
         close(fd);
@@ skipping 372 matching lines @@
       SpawnChild("process_util_test_never_die", false);
   ASSERT_TRUE(child_process);
   base::EnsureProcessTerminated(child_process);
   base::WaitForSingleProcess(child_process, 5000);
 
   // Check that process was really killed.
   EXPECT_TRUE(IsProcessDead(child_process));
   base::CloseProcessHandle(child_process);
 }
 
-MULTIPROCESS_TEST_MAIN(process_util_test_never_die) {
+MULTIPROCESS_TEST_MAIN(process_util_test_never_die, NULL) {
   while (1) {
     sleep(500);
   }
   return 0;
 }
 
 TEST_F(ProcessUtilTest, ImmediateTermination) {
   base::ProcessHandle child_process =
       SpawnChild("process_util_test_die_immediately", false);
   ASSERT_TRUE(child_process);
   // Give it time to die.
   sleep(2);
   base::EnsureProcessTerminated(child_process);
 
   // Check that process was really killed.
   EXPECT_TRUE(IsProcessDead(child_process));
   base::CloseProcessHandle(child_process);
 }
 
-MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately) {
+MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately, NULL) {
   return 0;
 }
 
 #endif  // defined(OS_POSIX)
 
 // Android doesn't implement set_new_handler, so we can't use the
 // OutOfMemoryTest cases.
 // OpenBSD does not support these tests either.
 // AddressSanitizer defines the malloc()/free()/etc. functions so that they
 // don't crash if the program is out of memory, so the OOM tests aren't supposed
@@ skipping 235 matching lines @@
       SetUpInDeathAssert();
       while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {}
     }, "");
 }
 
 #endif  // !ARCH_CPU_64_BITS
 #endif  // OS_MACOSX
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
         // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)