Index: components/metrics_services_manager/metrics_services_manager.h |
diff --git a/components/metrics_services_manager/metrics_services_manager.h b/components/metrics_services_manager/metrics_services_manager.h |
index 130915ab06677086b99aacf539d61ea4b829447c..d559ffbd92e4629be2c993256d4c467b2f7db223 100644 |
--- a/components/metrics_services_manager/metrics_services_manager.h |
+++ b/components/metrics_services_manager/metrics_services_manager.h |
@@ -5,8 +5,9 @@ |
#ifndef COMPONENTS_METRICS_SERVICES_MANAGER_METRICS_SERVICES_MANAGER_H_ |
#define COMPONENTS_METRICS_SERVICES_MANAGER_METRICS_SERVICES_MANAGER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/threading/thread_checker.h" |
namespace base { |
@@ -38,7 +39,7 @@ class MetricsServicesManager { |
public: |
// Creates the MetricsServicesManager with the given client. |
explicit MetricsServicesManager( |
- scoped_ptr<MetricsServicesManagerClient> client); |
+ std::unique_ptr<MetricsServicesManagerClient> client); |
virtual ~MetricsServicesManager(); |
// Returns the MetricsService, creating it if it hasn't been created yet (and |
@@ -80,7 +81,7 @@ class MetricsServicesManager { |
void UpdateRunningServices(); |
// The client passed in from the embedder. |
- scoped_ptr<MetricsServicesManagerClient> client_; |
+ std::unique_ptr<MetricsServicesManagerClient> client_; |
// Ensures that all functions are called from the same thread. |
base::ThreadChecker thread_checker_; |
@@ -92,13 +93,13 @@ class MetricsServicesManager { |
bool may_record_; |
// The MetricsServiceClient. Owns the MetricsService. |
- scoped_ptr<metrics::MetricsServiceClient> metrics_service_client_; |
+ std::unique_ptr<metrics::MetricsServiceClient> metrics_service_client_; |
// The RapporService, for RAPPOR metric uploads. |
- scoped_ptr<rappor::RapporService> rappor_service_; |
+ std::unique_ptr<rappor::RapporService> rappor_service_; |
// The VariationsService, for server-side experiments infrastructure. |
- scoped_ptr<variations::VariationsService> variations_service_; |
+ std::unique_ptr<variations::VariationsService> variations_service_; |
DISALLOW_COPY_AND_ASSIGN(MetricsServicesManager); |
}; |