| Index: base/profiler/win32_stack_frame_unwinder.cc
|
| diff --git a/base/profiler/win32_stack_frame_unwinder.cc b/base/profiler/win32_stack_frame_unwinder.cc
|
| index 472f4f15ffdbac803189d5e7875c9e8e7c559db8..9e6ab392524e27cb8083feb4f01669d28df08a26 100644
|
| --- a/base/profiler/win32_stack_frame_unwinder.cc
|
| +++ b/base/profiler/win32_stack_frame_unwinder.cc
|
| @@ -2,12 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/macros.h"
|
| #include "base/profiler/win32_stack_frame_unwinder.h"
|
|
|
| #include <windows.h>
|
| +
|
| #include <utility>
|
|
|
| +#include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| +
|
| namespace base {
|
|
|
| // Win32UnwindFunctions -------------------------------------------------------
|
| @@ -109,8 +112,7 @@ Win32StackFrameUnwinder::UnwindFunctions::~UnwindFunctions() {}
|
| Win32StackFrameUnwinder::UnwindFunctions::UnwindFunctions() {}
|
|
|
| Win32StackFrameUnwinder::Win32StackFrameUnwinder()
|
| - : Win32StackFrameUnwinder(make_scoped_ptr(new Win32UnwindFunctions)) {
|
| -}
|
| + : Win32StackFrameUnwinder(WrapUnique(new Win32UnwindFunctions)) {}
|
|
|
| Win32StackFrameUnwinder::~Win32StackFrameUnwinder() {}
|
|
|
| @@ -178,8 +180,7 @@ bool Win32StackFrameUnwinder::TryUnwind(CONTEXT* context,
|
| }
|
|
|
| Win32StackFrameUnwinder::Win32StackFrameUnwinder(
|
| - scoped_ptr<UnwindFunctions> unwind_functions)
|
| - : at_top_frame_(true),
|
| - unwind_functions_(std::move(unwind_functions)) {}
|
| + std::unique_ptr<UnwindFunctions> unwind_functions)
|
| + : at_top_frame_(true), unwind_functions_(std::move(unwind_functions)) {}
|
|
|
| } // namespace base
|
|
|