win: Fix incorrect thread suspend count due to ScopedProcessSuspend

handler/win/crash_report_exception_handler.cc

 // Copyright 2015 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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "handler/win/crash_report_exception_handler.h"
 
 #include "client/crash_report_database.h"
 #include "client/settings.h"
 #include "handler/crash_report_upload_thread.h"
 #include "minidump/minidump_file_writer.h"
 #include "snapshot/win/process_snapshot_win.h"
 #include "util/file/file_writer.h"
 #include "util/win/registration_protocol_win.h"
-#include "util/win/scoped_process_suspend.h"
 
 namespace crashpad {
 
 CrashReportExceptionHandler::CrashReportExceptionHandler(
     CrashReportDatabase* database,
     CrashReportUploadThread* upload_thread,
     const std::map<std::string, std::string>* process_annotations)
     : database_(database),
       upload_thread_(upload_thread),
       process_annotations_(process_annotations) {
 }
 
 CrashReportExceptionHandler::~CrashReportExceptionHandler() {
 }
 
 void CrashReportExceptionHandler::ExceptionHandlerServerStarted() {
 }
 
 unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
     HANDLE process,
     WinVMAddress exception_information_address) {
   const unsigned int kFailedTerminationCode = 0xffff7002;
 
-  ScopedProcessSuspend suspend(process);
-
   ProcessSnapshotWin process_snapshot;
-  if (!process_snapshot.Initialize(process)) {
+  if (!process_snapshot.Initialize(process,
+                                   ProcessSuspensionState::kSuspended)) {
     LOG(WARNING) << "ProcessSnapshotWin::Initialize failed";
     return kFailedTerminationCode;
   }
 
   if (!process_snapshot.InitializeException(exception_information_address)) {
     LOG(WARNING) << "ProcessSnapshotWin::InitializeException failed";
     return kFailedTerminationCode;
   }
 
   // Now that we have the exception information, even if something else fails we
@@ skipping 47 matching lines @@
       return termination_code;
     }
 
     upload_thread_->ReportPending();
   }
 
   return termination_code;
 }
 
 }  // namespace crashpad