| Index: chrome/app/chrome_crash_reporter_client.cc
|
| diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc
|
| index 2a8db668a314983955ec33ed1ffc258004910159..849e57563d7f7931d6637f2dc20d5a8fae034154 100644
|
| --- a/chrome/app/chrome_crash_reporter_client.cc
|
| +++ b/chrome/app/chrome_crash_reporter_client.cc
|
| @@ -78,7 +78,7 @@ bool ChromeCrashReporterClient::GetAlternativeCrashDumpLocation(
|
| base::FilePath* crash_dir) {
|
| // By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
|
| // location to write breakpad crash dumps can be set.
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| + std::unique_ptr<base::Environment> env(base::Environment::Create());
|
| std::string alternate_crash_dump_location;
|
| if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_crash_dump_location)) {
|
| *crash_dir = base::FilePath::FromUTF8Unsafe(alternate_crash_dump_location);
|
| @@ -99,7 +99,7 @@ void ChromeCrashReporterClient::GetProductNameAndVersion(
|
| DCHECK(special_build);
|
| DCHECK(channel_name);
|
|
|
| - scoped_ptr<FileVersionInfo> version_info(
|
| + std::unique_ptr<FileVersionInfo> version_info(
|
| FileVersionInfo::CreateFileVersionInfo(exe_path));
|
|
|
| if (version_info.get()) {
|
| @@ -123,7 +123,7 @@ void ChromeCrashReporterClient::GetProductNameAndVersion(
|
| bool ChromeCrashReporterClient::ShouldShowRestartDialog(base::string16* title,
|
| base::string16* message,
|
| bool* is_rtl_locale) {
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| + std::unique_ptr<base::Environment> env(base::Environment::Create());
|
| if (!env->HasVar(env_vars::kShowRestart) ||
|
| !env->HasVar(env_vars::kRestartInfo) ||
|
| env->HasVar(env_vars::kMetroConnected)) {
|
| @@ -149,7 +149,7 @@ bool ChromeCrashReporterClient::ShouldShowRestartDialog(base::string16* title,
|
| }
|
|
|
| bool ChromeCrashReporterClient::AboutToRestart() {
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| + std::unique_ptr<base::Environment> env(base::Environment::Create());
|
| if (!env->HasVar(env_vars::kRestartInfo))
|
| return false;
|
|
|
| @@ -282,7 +282,7 @@ bool ChromeCrashReporterClient::GetCrashDumpLocation(
|
| base::FilePath* crash_dir) {
|
| // By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
|
| // location to write breakpad crash dumps can be set.
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| + std::unique_ptr<base::Environment> env(base::Environment::Create());
|
| std::string alternate_crash_dump_location;
|
| if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_crash_dump_location)) {
|
| base::FilePath crash_dumps_dir_path =
|
| @@ -314,7 +314,7 @@ size_t ChromeCrashReporterClient::RegisterCrashKeys() {
|
| }
|
|
|
| bool ChromeCrashReporterClient::IsRunningUnattended() {
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| + std::unique_ptr<base::Environment> env(base::Environment::Create());
|
| return env->HasVar(env_vars::kHeadless);
|
| }
|
|
|
|
|