Update Crashpad to b47bf6c250c6b825dee1c5fbad9152c2c962e828

third_party/crashpad/crashpad/handler/win/crash_other_program.cc

 // Copyright 2016 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 28 matching lines @@
   }
   ScopedFileHANDLE thread_snap(thread_snap_raw);
 
   THREADENTRY32 te32;
   te32.dwSize = sizeof(THREADENTRY32);
   if (!Thread32First(thread_snap.get(), &te32)) {
     LOG(ERROR) << "Thread32First";
     return false;
   }
 
-  int thread_count = 0;
   do {
     if (te32.th32OwnerProcessID == target_pid) {
-      thread_count++;
-      if (thread_count == 2) {
-        // Nominate this lucky thread as our blamee, and dump it. This will be
-        // "Thread1" in the child.
+      // We set the thread priority of "Thread1" to a non-default value before
+      // going to sleep. Dump and blame this thread. For an explanation of
+      // "9", see
+      // https://msdn.microsoft.com/en-us/library/windows/desktop/ms685100.aspx.
+      if (te32.tpBasePri == 9) {
         ScopedKernelHANDLE thread(
             OpenThread(kXPThreadAllAccess, false, te32.th32ThreadID));
         if (!client.DumpAndCrashTargetProcess(
                 process, thread.get(), 0xdeadbea7)) {
           LOG(ERROR) << "DumpAndCrashTargetProcess failed";
           return false;
         }
         return true;
       }
     }
   } while (Thread32Next(thread_snap.get(), &te32));
 
   return false;
 }
 
 int CrashOtherProgram(int argc, wchar_t* argv[]) {
   CrashpadClient client;
 
   if (argc == 2 || argc == 3) {
     if (!client.SetHandlerIPCPipe(argv[1])) {
       LOG(ERROR) << "SetHandler";
       return EXIT_FAILURE;
     }
   } else {
     fprintf(stderr, "Usage: %ls <server_pipe_name> [noexception]\n", argv[0]);
     return EXIT_FAILURE;
   }
 
-  if (!client.UseHandler()) {
-    LOG(ERROR) << "UseHandler";
-    return EXIT_FAILURE;
-  }
-
   // Launch another process that hangs.
   base::FilePath test_executable = Paths::Executable();
   std::wstring child_test_executable =
       test_executable.DirName().Append(L"hanging_program.exe").value();
   ChildLauncher child(child_test_executable, argv[1]);
   child.Start();
 
   // Wait until it's ready.
   char c;
   if (!LoggingReadFile(child.stdout_read_handle(), &c, sizeof(c)) || c != ' ') {
@@ skipping 12 matching lines @@
   return EXIT_FAILURE;
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad
 
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::test::CrashOtherProgram(argc, argv);
 }