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

Unified Diff: chrome/browser/chromeos/arc/arc_service_launcher.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/chromeos/arc/arc_service_launcher.cc
diff --git a/chrome/browser/chromeos/arc/arc_service_launcher.cc b/chrome/browser/chromeos/arc/arc_service_launcher.cc
index 48a9a0bee348d5cd6743c9d1106065c6a7a5d2aa..ccc8c565ba7a30ec1d2840cf221b90d7d985812f 100644
--- a/chrome/browser/chromeos/arc/arc_service_launcher.cc
+++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/arc/arc_service_launcher.h"
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/arc/arc_auth_service.h"
#include "chrome/browser/chromeos/arc/arc_policy_bridge.h"
#include "chrome/browser/chromeos/arc/arc_process_service.h"
@@ -22,13 +23,13 @@ ArcServiceLauncher::~ArcServiceLauncher() {}
void ArcServiceLauncher::Initialize() {
// Create ARC service manager.
arc_service_manager_.reset(new ArcServiceManager());
- arc_service_manager_->AddService(make_scoped_ptr(
+ arc_service_manager_->AddService(base::WrapUnique(
new ArcAuthService(arc_service_manager_->arc_bridge_service())));
- arc_service_manager_->AddService(make_scoped_ptr(
+ arc_service_manager_->AddService(base::WrapUnique(
new ArcPolicyBridge(arc_service_manager_->arc_bridge_service())));
- arc_service_manager_->AddService(make_scoped_ptr(
+ arc_service_manager_->AddService(base::WrapUnique(
new ArcProcessService(arc_service_manager_->arc_bridge_service())));
- arc_service_manager_->AddService(make_scoped_ptr(
+ arc_service_manager_->AddService(base::WrapUnique(
new ArcSettingsService(arc_service_manager_->arc_bridge_service())));
// Detect availiability.
« no previous file with comments | « chrome/browser/chromeos/arc/arc_service_launcher.h ('k') | chrome/browser/chromeos/arc/arc_settings_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698