Index: third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h |
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h |
index f47b856da2b1342167a34d2c4b82ba9729cfb701..633d9b9b057d91e87ae8425613afc0c07a580463 100644 |
--- a/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h |
+++ b/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h |
@@ -20,12 +20,12 @@ |
#include <sys/types.h> |
#include <map> |
+#include <memory> |
#include <string> |
#include <utility> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "snapshot/exception_snapshot.h" |
#include "snapshot/memory_map_region_snapshot.h" |
#include "snapshot/memory_snapshot.h" |
@@ -73,7 +73,7 @@ class TestProcessSnapshot final : public ProcessSnapshot { |
//! |
//! \param[in] system The system snapshot that System() will return. The |
//! TestProcessSnapshot object takes ownership of \a system. |
- void SetSystem(scoped_ptr<SystemSnapshot> system) { |
+ void SetSystem(std::unique_ptr<SystemSnapshot> system) { |
system_ = std::move(system); |
} |
@@ -81,7 +81,7 @@ class TestProcessSnapshot final : public ProcessSnapshot { |
//! |
//! \param[in] thread The thread snapshot that will be included in Threads(). |
//! The TestProcessSnapshot object takes ownership of \a thread. |
- void AddThread(scoped_ptr<ThreadSnapshot> thread) { |
+ void AddThread(std::unique_ptr<ThreadSnapshot> thread) { |
threads_.push_back(thread.release()); |
} |
@@ -89,7 +89,7 @@ class TestProcessSnapshot final : public ProcessSnapshot { |
//! |
//! \param[in] module The module snapshot that will be included in Modules(). |
//! The TestProcessSnapshot object takes ownership of \a module. |
- void AddModule(scoped_ptr<ModuleSnapshot> module) { |
+ void AddModule(std::unique_ptr<ModuleSnapshot> module) { |
modules_.push_back(module.release()); |
} |
@@ -106,7 +106,7 @@ class TestProcessSnapshot final : public ProcessSnapshot { |
//! |
//! \param[in] exception The exception snapshot that Exception() will return. |
//! The TestProcessSnapshot object takes ownership of \a exception. |
- void SetException(scoped_ptr<ExceptionSnapshot> exception) { |
+ void SetException(std::unique_ptr<ExceptionSnapshot> exception) { |
exception_ = std::move(exception); |
} |
@@ -115,7 +115,7 @@ class TestProcessSnapshot final : public ProcessSnapshot { |
//! \param[in] region The memory map region snapshot that will be included in |
//! MemoryMap(). The TestProcessSnapshot object takes ownership of \a |
//! region. |
- void AddMemoryMapRegion(scoped_ptr<MemoryMapRegionSnapshot> region) { |
+ void AddMemoryMapRegion(std::unique_ptr<MemoryMapRegionSnapshot> region) { |
memory_map_.push_back(region.release()); |
} |
@@ -131,7 +131,7 @@ class TestProcessSnapshot final : public ProcessSnapshot { |
//! \param[in] extra_memory The memory snapshot that will be included in |
//! ExtraMemory(). The TestProcessSnapshot object takes ownership of \a |
//! extra_memory. |
- void AddExtraMemory(scoped_ptr<MemorySnapshot> extra_memory) { |
+ void AddExtraMemory(std::unique_ptr<MemorySnapshot> extra_memory) { |
extra_memory_.push_back(extra_memory.release()); |
} |
@@ -165,11 +165,11 @@ class TestProcessSnapshot final : public ProcessSnapshot { |
UUID report_id_; |
UUID client_id_; |
std::map<std::string, std::string> annotations_simple_map_; |
- scoped_ptr<SystemSnapshot> system_; |
+ std::unique_ptr<SystemSnapshot> system_; |
PointerVector<ThreadSnapshot> threads_; |
PointerVector<ModuleSnapshot> modules_; |
std::vector<UnloadedModuleSnapshot> unloaded_modules_; |
- scoped_ptr<ExceptionSnapshot> exception_; |
+ std::unique_ptr<ExceptionSnapshot> exception_; |
PointerVector<MemoryMapRegionSnapshot> memory_map_; |
std::vector<HandleSnapshot> handles_; |
PointerVector<MemorySnapshot> extra_memory_; |