diff --git a/snapshot/linux/process_reader.cc b/snapshot/linux/process_reader.cc index 904fdced..c9a5a382 100644 --- a/snapshot/linux/process_reader.cc +++ b/snapshot/linux/process_reader.cc @@ -192,8 +192,7 @@ bool ProcessReader::Initialize(PtraceConnection* connection) { return false; } - process_memory_.reset(new ProcessMemoryLinux()); - if (!process_memory_->Initialize(pid)) { + if (!process_memory_.Initialize(pid)) { return false; } diff --git a/snapshot/linux/process_reader.h b/snapshot/linux/process_reader.h index 85708383..26d777e4 100644 --- a/snapshot/linux/process_reader.h +++ b/snapshot/linux/process_reader.h @@ -18,7 +18,6 @@ #include #include -#include #include #include "base/macros.h" @@ -79,7 +78,7 @@ class ProcessReader { pid_t ParentProcessID() const { return process_info_.ParentProcessID(); } //! \brief Return a memory reader for the target process. - ProcessMemory* Memory() { return process_memory_.get(); } + ProcessMemory* Memory() { return &process_memory_; } //! \brief Return a memory map of the target process. MemoryMap* GetMemoryMap() { return &memory_map_; } @@ -113,9 +112,9 @@ class ProcessReader { PtraceConnection* connection_; // weak ProcessInfo process_info_; - class MemoryMap memory_map_; + MemoryMap memory_map_; std::vector threads_; - std::unique_ptr process_memory_; + ProcessMemoryLinux process_memory_; bool is_64_bit_; bool initialized_threads_; InitializationStateDcheck initialized_; diff --git a/snapshot/linux/process_reader_test.cc b/snapshot/linux/process_reader_test.cc index 5c8b8cba..08edf02a 100644 --- a/snapshot/linux/process_reader_test.cc +++ b/snapshot/linux/process_reader_test.cc @@ -24,6 +24,7 @@ #include #include +#include #include #include diff --git a/util/process/process_memory_linux.h b/util/process/process_memory_linux.h index 95e93f5a..e03e251f 100644 --- a/util/process/process_memory_linux.h +++ b/util/process/process_memory_linux.h @@ -27,7 +27,7 @@ namespace crashpad { //! \brief Accesses the memory of another Linux process. -class ProcessMemoryLinux : public ProcessMemory { +class ProcessMemoryLinux final : public ProcessMemory { public: ProcessMemoryLinux(); ~ProcessMemoryLinux();