| Index: third_party/crashpad/crashpad/handler/handler_main.cc
|
| diff --git a/third_party/crashpad/crashpad/handler/handler_main.cc b/third_party/crashpad/crashpad/handler/handler_main.cc
|
| index 923d2b7ca770326849b7b58db5cd1d8dcd251283..7ad13f6ff0107ee3016fb024323e100b5156b378 100644
|
| --- a/third_party/crashpad/crashpad/handler/handler_main.cc
|
| +++ b/third_party/crashpad/crashpad/handler/handler_main.cc
|
| @@ -19,6 +19,7 @@
|
|
|
| #include <map>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/auto_reset.h"
|
| #include "base/files/file_path.h"
|
| @@ -33,7 +34,6 @@
|
| #include "tools/tool_support.h"
|
| #include "handler/crash_report_upload_thread.h"
|
| #include "util/file/file_io.h"
|
| -#include "util/stdlib/move.h"
|
| #include "util/stdlib/map_insert.h"
|
| #include "util/stdlib/string_number_conversion.h"
|
| #include "util/string/split_string.h"
|
| @@ -315,7 +315,7 @@ int HandlerMain(int argc, char* argv[]) {
|
| }
|
|
|
| ExceptionHandlerServer exception_handler_server(
|
| - crashpad::move(receive_right), !options.mach_service.empty());
|
| + std::move(receive_right), !options.mach_service.empty());
|
| base::AutoReset<ExceptionHandlerServer*> reset_g_exception_handler_server(
|
| &g_exception_handler_server, &exception_handler_server);
|
|
|
| @@ -337,9 +337,12 @@ int HandlerMain(int argc, char* argv[]) {
|
| reset_sigterm.reset(&old_sa);
|
| }
|
| #elif defined(OS_WIN)
|
| + // Shut down as late as possible relative to programs we're watching.
|
| + if (!SetProcessShutdownParameters(0x100, SHUTDOWN_NORETRY))
|
| + PLOG(ERROR) << "SetProcessShutdownParameters";
|
| +
|
| ExceptionHandlerServer exception_handler_server(!options.pipe_name.empty());
|
|
|
| - std::string pipe_name;
|
| if (!options.pipe_name.empty()) {
|
| exception_handler_server.SetPipeName(base::UTF8ToUTF16(options.pipe_name));
|
| } else if (options.handshake_handle != INVALID_HANDLE_VALUE) {
|
|
|