From 48b161f210501543befbacda1b1c727c570febad Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sun, 22 May 2016 18:30:14 +0900 Subject: [PATCH] Update crashpad to 35da3b6 --- atom/common/crash_reporter/crash_reporter_mac.mm | 6 ++++-- vendor/crashpad | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/atom/common/crash_reporter/crash_reporter_mac.mm b/atom/common/crash_reporter/crash_reporter_mac.mm index 130a421665f7..ee2ce036048f 100644 --- a/atom/common/crash_reporter/crash_reporter_mac.mm +++ b/atom/common/crash_reporter/crash_reporter_mac.mm @@ -4,6 +4,8 @@ #include "atom/common/crash_reporter/crash_reporter_mac.h" +#include + #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/mac/bundle_locations.h" @@ -73,7 +75,7 @@ void CrashReporterMac::InitBreakpad(const std::string& product_name, SetCrashKeyValue(upload_parameter.first, upload_parameter.second); } if (is_browser_) { - scoped_ptr database = + std::unique_ptr database = crashpad::CrashReportDatabase::Initialize(database_path); if (database) { database->GetSettings()->SetUploadsEnabled(auto_submit); @@ -99,7 +101,7 @@ CrashReporterMac::GetUploadedReports(const std::string& path) { return uploaded_reports; } // Load crashpad database. - scoped_ptr database = + std::unique_ptr database = crashpad::CrashReportDatabase::Initialize(file_path); DCHECK(database); diff --git a/vendor/crashpad b/vendor/crashpad index e2073935d7c6..51f78aefa872 160000 --- a/vendor/crashpad +++ b/vendor/crashpad @@ -1 +1 @@ -Subproject commit e2073935d7c674f4a9e7fced821f611c5b13f07b +Subproject commit 51f78aefa872211022ae2d44260cbfd07a6aeb6a