Index: base/debug/stack_trace_posix.cc |
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc |
index 0551784ebe4f09c98ac4557da63f833c77537f3c..fc3ee14c7b9d60958ad6d6000d94cbc616b6c7df 100644 |
--- a/base/debug/stack_trace_posix.cc |
+++ b/base/debug/stack_trace_posix.cc |
@@ -17,12 +17,11 @@ |
#include <unistd.h> |
#include <map> |
+#include <memory> |
#include <ostream> |
#include <string> |
#include <vector> |
-#include "base/memory/free_deleter.h" |
- |
#if defined(__GLIBCXX__) |
#include <cxxabi.h> |
#endif |
@@ -38,7 +37,7 @@ |
#include "base/debug/proc_maps_linux.h" |
#include "base/logging.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/free_deleter.h" |
#include "base/memory/singleton.h" |
#include "base/numerics/safe_conversions.h" |
#include "base/posix/eintr_wrapper.h" |
@@ -99,7 +98,7 @@ void DemangleSymbols(std::string* text) { |
// Try to demangle the mangled symbol candidate. |
int status = 0; |
- scoped_ptr<char, base::FreeDeleter> demangled_symbol( |
+ std::unique_ptr<char, base::FreeDeleter> demangled_symbol( |
abi::__cxa_demangle(mangled_symbol.c_str(), NULL, 0, &status)); |
if (status == 0) { // Demangling is successful. |
// Remove the mangled symbol. |
@@ -180,8 +179,8 @@ void ProcessBacktrace(void *const *trace, |
// Below part is async-signal unsafe (uses malloc), so execute it only |
// when we are not executing the signal handler. |
if (in_signal_handler == 0) { |
- scoped_ptr<char*, FreeDeleter> |
- trace_symbols(backtrace_symbols(trace, size)); |
+ std::unique_ptr<char*, FreeDeleter> trace_symbols( |
+ backtrace_symbols(trace, size)); |
if (trace_symbols.get()) { |
for (size_t i = 0; i < size; ++i) { |
std::string trace_symbol = trace_symbols.get()[i]; |