Update Crashpad to b47bf6c250c6b825dee1c5fbad9152c2c962e828

components/crash/content/app/crashpad_win.cc

 // Copyright 2015 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 "components/crash/content/app/crashpad.h"
 
 #include <memory>
 
 #include "base/debug/crash_logging.h"
 #include "base/environment.h"
@@ skipping 40 matching lines @@
 #elif defined(ARCH_CPU_X86_64)
   (*annotations)["plat"] = std::string("Win64");
 #endif
 }
 
 base::FilePath PlatformCrashpadInitialization(bool initial_client,
                                               bool browser_process,
                                               bool embedded_handler) {
   base::FilePath database_path;  // Only valid in the browser process.
   base::FilePath metrics_path;  // Only valid in the browser process.
-  bool result = false;
 
   const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
   const char kServerUrlVar[] = "CHROME_CRASHPAD_SERVER_URL";
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   if (initial_client) {
     CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
 
     base::string16 database_path_str;
     if (crash_reporter_client->GetCrashDumpLocation(&database_path_str))
       database_path = base::FilePath(database_path_str);
@@ skipping 40 matching lines @@
       arguments.push_back(std::string("--type=") + switches::kCrashpadHandler);
       // The prefetch argument added here has to be documented in
       // chrome_switches.cc, below the kPrefetchArgument* constants. A constant
       // can't be used here because crashpad can't depend on Chrome.
       arguments.push_back("/prefetch:7");
     } else {
       base::FilePath exe_dir = exe_file.DirName();
       exe_file = exe_dir.Append(FILE_PATH_LITERAL("crashpad_handler.exe"));
     }
 
-    result = g_crashpad_client.Get().StartHandler(
+    g_crashpad_client.Get().StartHandler(
         exe_file, database_path, metrics_path, url, process_annotations,
-        arguments, false);
+        arguments, false, false);
 
     // If we're the browser, push the pipe name into the environment so child
     // processes can connect to it. If we inherited another crashpad_handler's
     // pipe name, we'll overwrite it here.
     env->SetVar(kPipeNameVar,
                 base::UTF16ToUTF8(g_crashpad_client.Get().GetHandlerIPCPipe()));
   } else {
     std::string pipe_name_utf8;
-    result = env->GetVar(kPipeNameVar, &pipe_name_utf8);
-    if (result) {
-      result = g_crashpad_client.Get().SetHandlerIPCPipe(
+    if (env->GetVar(kPipeNameVar, &pipe_name_utf8)) {
+      g_crashpad_client.Get().SetHandlerIPCPipe(
           base::UTF8ToUTF16(pipe_name_utf8));
     }
   }
 
-  if (result) {
-    result = g_crashpad_client.Get().UseHandler();
-  }
   return database_path;
 }
 
 // TODO(scottmg): http://crbug.com/546288 These exported functions are for
 // compatibility with how Breakpad worked, but it seems like there's no need to
 // do the CreateRemoteThread() dance with a minor extension of the Crashpad API
 // (to just pass the pid we want a dump for). We should add that and then modify
 // hang_crash_dump_win.cc to work in a more direct manner.
 
 // Used for dumping a process state when there is no crash.
@@ skipping 156 matching lines @@
 void __declspec(dllexport) __cdecl UnregisterNonABICompliantCodeRange(
     void* start) {
   ExceptionHandlerRecord* record =
       reinterpret_cast<ExceptionHandlerRecord*>(start);
 
   CHECK(RtlDeleteFunctionTable(&record->runtime_function));
 }
 #endif  // ARCH_CPU_X86_64
 
 }  // extern "C"