Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4981)

Unified Diff: chrome/service/service_process.cc

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/service/service_process.h ('k') | chrome/service/service_process_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/service_process.cc
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
index 8cba1bcae70a55145619d4ae4a7f8af8f62f9368..9896ef66b94e9f4a35946f80207c948f30ea8490 100644
--- a/chrome/service/service_process.cc
+++ b/chrome/service/service_process.cc
@@ -13,6 +13,7 @@
#include "base/i18n/rtl.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "base/path_service.h"
#include "base/single_thread_task_runner.h"
@@ -84,7 +85,7 @@ void ServiceIOThread::CleanUp() {
// chrome executable's lifetime.
void PrepareRestartOnCrashEnviroment(
const base::CommandLine& parsed_command_line) {
- scoped_ptr<base::Environment> env(base::Environment::Create());
+ std::unique_ptr<base::Environment> env(base::Environment::Create());
// Clear this var so child processes don't show the dialog by default.
env->UnSetVar(env_vars::kShowRestart);
@@ -200,7 +201,7 @@ bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop,
io_task_runner(),
service_process_state_->GetServiceProcessChannel(),
&shutdown_event_));
- ipc_server_->AddMessageHandler(make_scoped_ptr(
+ ipc_server_->AddMessageHandler(base::WrapUnique(
new cloud_print::CloudPrintMessageHandler(ipc_server_.get(), this)));
ipc_server_->Init();
« no previous file with comments | « chrome/service/service_process.h ('k') | chrome/service/service_process_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698