| Index: third_party/crashpad/crashpad/handler/handler_main.cc
|
| diff --git a/third_party/crashpad/crashpad/handler/handler_main.cc b/third_party/crashpad/crashpad/handler/handler_main.cc
|
| index e022dace31b3355a2823e5532b287a844c62548f..3240cd38b37d79d6c915560aa41f325702cf00cd 100644
|
| --- a/third_party/crashpad/crashpad/handler/handler_main.cc
|
| +++ b/third_party/crashpad/crashpad/handler/handler_main.cc
|
| @@ -19,6 +19,7 @@
|
| #include <stdlib.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <utility>
|
|
|
| @@ -26,7 +27,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/files/scoped_file.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/scoped_generic.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| @@ -386,7 +386,7 @@ int HandlerMain(int argc, char* argv[]) {
|
| }
|
| #endif // OS_MACOSX
|
|
|
| - scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
|
| + std::unique_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
|
| base::FilePath(ToolSupport::CommandLineArgumentToFilePathStringType(
|
| options.database))));
|
| if (!database) {
|
|
|