| Index: remoting/base/breakpad_win.cc
|
| diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc
|
| index 6ba02c5b43610def5a509680c1e497ba9930ff98..dc522230b787148f5b03204983dd6c3c19034b65 100644
|
| --- a/remoting/base/breakpad_win.cc
|
| +++ b/remoting/base/breakpad_win.cc
|
| @@ -10,6 +10,8 @@
|
| #include "remoting/base/breakpad.h"
|
|
|
| #include <windows.h>
|
| +
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/atomicops.h"
|
| @@ -17,7 +19,6 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/win/current_module.h"
|
| #include "base/win/wrapped_window_proc.h"
|
| @@ -77,7 +78,7 @@ class BreakpadWin {
|
| static int OnWindowProcedureException(EXCEPTION_POINTERS* exinfo);
|
|
|
| // Breakpad's exception handler.
|
| - scoped_ptr<google_breakpad::ExceptionHandler> breakpad_;
|
| + std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
|
|
|
| // This flag is used to indicate that an exception is already being handled.
|
| volatile AtomicWord handling_exception_;
|
| @@ -144,7 +145,7 @@ BreakpadWin* BreakpadWin::GetInstance() {
|
|
|
| // Returns the Custom information to be used for crash reporting.
|
| google_breakpad::CustomClientInfo* BreakpadWin::GetCustomInfo() {
|
| - scoped_ptr<FileVersionInfo> version_info(
|
| + std::unique_ptr<FileVersionInfo> version_info(
|
| FileVersionInfo::CreateFileVersionInfoForModule(CURRENT_MODULE()));
|
|
|
| static wchar_t version[64];
|
|
|