| Index: base/trace_event/memory_dump_session_state.h
|
| diff --git a/base/trace_event/memory_dump_session_state.h b/base/trace_event/memory_dump_session_state.h
|
| index 879545f658f2e9cea464d058f304a4838de071cf..7d871982e6e00229682dbf5838af8d3d9cea91ec 100644
|
| --- a/base/trace_event/memory_dump_session_state.h
|
| +++ b/base/trace_event/memory_dump_session_state.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef BASE_TRACE_EVENT_MEMORY_DUMP_SESSION_STATE_H_
|
| #define BASE_TRACE_EVENT_MEMORY_DUMP_SESSION_STATE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/base_export.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/trace_event/heap_profiler_stack_frame_deduplicator.h"
|
| #include "base/trace_event/heap_profiler_type_name_deduplicator.h"
|
|
|
| @@ -27,7 +28,7 @@ class BASE_EXPORT MemoryDumpSessionState
|
| }
|
|
|
| void SetStackFrameDeduplicator(
|
| - scoped_ptr<StackFrameDeduplicator> stack_frame_deduplicator);
|
| + std::unique_ptr<StackFrameDeduplicator> stack_frame_deduplicator);
|
|
|
| // Returns the type name deduplicator that should be used by memory dump
|
| // providers when doing a heap dump.
|
| @@ -36,7 +37,7 @@ class BASE_EXPORT MemoryDumpSessionState
|
| }
|
|
|
| void SetTypeNameDeduplicator(
|
| - scoped_ptr<TypeNameDeduplicator> type_name_deduplicator);
|
| + std::unique_ptr<TypeNameDeduplicator> type_name_deduplicator);
|
|
|
| private:
|
| friend class RefCountedThreadSafe<MemoryDumpSessionState>;
|
| @@ -44,11 +45,11 @@ class BASE_EXPORT MemoryDumpSessionState
|
|
|
| // Deduplicates backtraces in heap dumps so they can be written once when the
|
| // trace is finalized.
|
| - scoped_ptr<StackFrameDeduplicator> stack_frame_deduplicator_;
|
| + std::unique_ptr<StackFrameDeduplicator> stack_frame_deduplicator_;
|
|
|
| // Deduplicates type names in heap dumps so they can be written once when the
|
| // trace is finalized.
|
| - scoped_ptr<TypeNameDeduplicator> type_name_deduplicator_;
|
| + std::unique_ptr<TypeNameDeduplicator> type_name_deduplicator_;
|
| };
|
|
|
| } // namespace trace_event
|
|
|