mac: Make crashpad_handler get its receive right from its client

handler/main.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 16 matching lines @@
 #include "client/crashpad_client.h"
 #include "tools/tool_support.h"
 #include "handler/crash_report_upload_thread.h"
 #include "util/stdlib/map_insert.h"
 #include "util/stdlib/string_number_conversion.h"
 #include "util/string/split_string.h"
 #include "util/synchronization/semaphore.h"
 
 #if defined(OS_MACOSX)
 #include <libgen.h>
+#include "base/mac/scoped_mach_port.h"
 #include "handler/mac/crash_report_exception_handler.h"
 #include "handler/mac/exception_handler_server.h"
 #include "util/mach/child_port_handshake.h"
 #include "util/posix/close_stdio.h"
 #elif defined(OS_WIN)
 #include <windows.h>
 #include "handler/win/crash_report_exception_handler.h"
 #include "util/win/exception_handler_server.h"
 #endif  // OS_MACOSX
 
@@ skipping 157 matching lines @@
     ToolSupport::UsageHint(me, "--database is required");
     return EXIT_FAILURE;
   }
 
   if (argc) {
     ToolSupport::UsageHint(me, nullptr);
     return EXIT_FAILURE;
   }
 
 #if defined(OS_MACOSX)
+  CloseStdinAndStdout();
+
   if (options.reset_own_crash_exception_port_to_system_default) {
     CrashpadClient::UseSystemDefaultHandler();
   }
-#endif
 
-#if defined(OS_MACOSX)
-  ExceptionHandlerServer exception_handler_server;
-
-  CloseStdinAndStdout();
-  if (!ChildPortHandshake::RunClientForFD(
+  base::mac::ScopedMachReceiveRight receive_right(
+      ChildPortHandshake::RunServerForFD(
           base::ScopedFD(options.handshake_fd),
-          exception_handler_server.receive_port(),
-          MACH_MSG_TYPE_MAKE_SEND)) {
+          ChildPortHandshake::PortRightType::kReceiveRight));
+  if (!receive_right.is_valid()) {
     return EXIT_FAILURE;
   }
+
+  ExceptionHandlerServer exception_handler_server(receive_right.Pass());
 #elif defined(OS_WIN)
   ExceptionHandlerServer exception_handler_server(options.pipe_name);
 #endif  // OS_MACOSX
 
   scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
       base::FilePath(ToolSupport::CommandLineArgumentToFilePathStringType(
           options.database))));
   if (!database) {
     return EXIT_FAILURE;
   }
@@ skipping 16 matching lines @@
 
 #if defined(OS_MACOSX)
 int main(int argc, char* argv[]) {
   return crashpad::HandlerMain(argc, argv);
 }
 #elif defined(OS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, crashpad::HandlerMain);
 }
 #endif  // OS_MACOSX