crashpad_database_util: add --new-report

handler/mac/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,
@@ skipping 18 matching lines @@
 #include "util/mach/exc_client_variants.h"
 #include "util/mach/exception_behaviors.h"
 #include "util/mach/mach_extensions.h"
 #include "util/mach/mach_message.h"
 #include "util/mach/scoped_task_suspend.h"
 #include "util/misc/tri_state.h"
 #include "util/misc/uuid.h"
 
 namespace crashpad {
 
-namespace {
-
-// Calls CrashReportDatabase::ErrorWritingCrashReport() upon destruction unless
-// disarmed by calling Disarm(). Armed upon construction.
-class CallErrorWritingCrashReport {
- public:
-  CallErrorWritingCrashReport(CrashReportDatabase* database,
-                              CrashReportDatabase::NewReport* new_report)
-      : database_(database),
-        new_report_(new_report) {
-  }
-
-  ~CallErrorWritingCrashReport() {
-    if (new_report_) {
-      database_->ErrorWritingCrashReport(new_report_);
-    }
-  }
-
-  void Disarm() {
-    new_report_ = nullptr;
-  }
-
- private:
-  CrashReportDatabase* database_;  // weak
-  CrashReportDatabase::NewReport* new_report_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(CallErrorWritingCrashReport);
-};
-
-}  // namespace
-
 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() {
@@ skipping 84 matching lines @@
 
     CrashReportDatabase::NewReport* new_report;
     CrashReportDatabase::OperationStatus database_status =
         database_->PrepareNewCrashReport(&new_report);
     if (database_status != CrashReportDatabase::kNoError) {
       return KERN_FAILURE;
     }
 
     process_snapshot.SetReportID(new_report->uuid);
 
-    CallErrorWritingCrashReport call_error_writing_crash_report(database_,
-                                                                new_report);
+    CrashReportDatabase::CallErrorWritingCrashReport
+        call_error_writing_crash_report(database_, new_report);
 
     WeakFileHandleFileWriter file_writer(new_report->handle);
 
     MinidumpFileWriter minidump;
     minidump.InitializeFromSnapshot(&process_snapshot);
     if (!minidump.WriteEverything(&file_writer)) {
       return KERN_FAILURE;
     }
 
     call_error_writing_crash_report.Disarm();
@@ skipping 59 matching lines @@
           &new_state_forward_count);
       MACH_LOG_IF(WARNING, kr != KERN_SUCCESS, kr)
           << "UniversalExceptionRaise " << kSystemCrashReporterServiceName;
     }
   }
 
   return ExcServerSuccessfulReturnValue(behavior, false);
 }
 
 }  // namespace crashpad