Update Crashpad to b47bf6c250c6b825dee1c5fbad9152c2c962e828

third_party/crashpad/crashpad/client/crashpad_client_mac.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 505 matching lines @@
   std::map<std::string, std::string> annotations_;
   std::vector<std::string> arguments_;
   base::mac::ScopedMachReceiveRight notify_port_;
   uint64_t last_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(HandlerStarter);
 };
 
 }  // namespace
 
-CrashpadClient::CrashpadClient()
-    : exception_port_() {
+CrashpadClient::CrashpadClient() {
 }
 
 CrashpadClient::~CrashpadClient() {
 }
 
 bool CrashpadClient::StartHandler(
     const base::FilePath& handler,
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
-    bool restartable) {
-  DCHECK(!exception_port_.is_valid());
-
+    bool restartable,
+    bool asynchronous_start) {
   // The “restartable” behavior can only be selected on OS X 10.10 and later. In
   // previous OS versions, if the initial client were to crash while attempting
   // to restart the handler, it would become an unkillable process.
   base::mac::ScopedMachSendRight exception_port(
       HandlerStarter::InitialStart(handler,
                                    database,
                                    metrics_dir,
                                    url,
                                    annotations,
                                    arguments,
                                    restartable && MacOSXMinorVersion() >= 10));
   if (!exception_port.is_valid()) {
     return false;
   }
 
   SetHandlerMachPort(std::move(exception_port));
   return true;
 }
 
 bool CrashpadClient::SetHandlerMachService(const std::string& service_name) {
   base::mac::ScopedMachSendRight exception_port(BootstrapLookUp(service_name));
   if (!exception_port.is_valid()) {
     return false;
   }
 
   SetHandlerMachPort(std::move(exception_port));
   return true;
 }
 
-void CrashpadClient::SetHandlerMachPort(
+bool CrashpadClient::SetHandlerMachPort(
     base::mac::ScopedMachSendRight exception_port) {
   DCHECK(exception_port.is_valid());
-  exception_port_ = std::move(exception_port);
-}
-
-bool CrashpadClient::UseHandler() {
-  DCHECK(exception_port_.is_valid());
-
-  return SetCrashExceptionPorts(exception_port_.get());
+  return SetCrashExceptionPorts(exception_port.get());
 }
 
 // static
 void CrashpadClient::UseSystemDefaultHandler() {
   base::mac::ScopedMachSendRight
       system_crash_reporter_handler(SystemCrashReporterHandler());
 
   // Proceed even if SystemCrashReporterHandler() failed, setting MACH_PORT_NULL
   // to clear the current exception ports.
   if (!SetCrashExceptionPorts(system_crash_reporter_handler.get())) {
     SetCrashExceptionPorts(MACH_PORT_NULL);
   }
 }
 
 }  // namespace crashpad