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

Unified Diff: components/arc/arc_service_manager.h

Issue 1921973002: Convert //components/[a-e]* 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 | « components/arc/arc_bridge_service_unittest.cc ('k') | components/arc/arc_service_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/arc_service_manager.h
diff --git a/components/arc/arc_service_manager.h b/components/arc/arc_service_manager.h
index bb7051ac6f06b4669c0d28990bb338c6881c41ff..30715e9b11d3701f704da452477f29fc02f9536b 100644
--- a/components/arc/arc_service_manager.h
+++ b/components/arc/arc_service_manager.h
@@ -5,10 +5,10 @@
#ifndef COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
#define COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
+#include <memory>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "components/signin/core/account_id/account_id.h"
@@ -29,7 +29,7 @@ class ArcServiceManager {
ArcBridgeService* arc_bridge_service();
// Adds a service to the managed services list.
- void AddService(scoped_ptr<ArcService> service);
+ void AddService(std::unique_ptr<ArcService> service);
// Gets the global instance of the ARC Service Manager. This can only be
// called on the thread that this class was created on.
@@ -44,12 +44,12 @@ class ArcServiceManager {
// Set ArcBridgeService instance for testing. Call before ArcServiceManager
// creation. ArcServiceManager owns |arc_bridge_service|.
static void SetArcBridgeServiceForTesting(
- scoped_ptr<ArcBridgeService> arc_bridge_service);
+ std::unique_ptr<ArcBridgeService> arc_bridge_service);
private:
base::ThreadChecker thread_checker_;
- scoped_ptr<ArcBridgeService> arc_bridge_service_;
- std::vector<scoped_ptr<ArcService>> services_;
+ std::unique_ptr<ArcBridgeService> arc_bridge_service_;
+ std::vector<std::unique_ptr<ArcService>> services_;
DISALLOW_COPY_AND_ASSIGN(ArcServiceManager);
};
« no previous file with comments | « components/arc/arc_bridge_service_unittest.cc ('k') | components/arc/arc_service_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698