Index: ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm |
diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm |
index 514b08c787e7fd66b9791f6a47da6edf1d094019..1337ab2c92b998542a0eafcfcedb0d0a297e4399 100644 |
--- a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm |
+++ b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm |
@@ -6,6 +6,7 @@ |
#include "base/command_line.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "components/metrics/metrics_state_manager.h" |
#include "components/prefs/pref_service.h" |
#include "components/rappor/rappor_service.h" |
@@ -23,8 +24,8 @@ namespace { |
void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) {} |
-scoped_ptr<metrics::ClientInfo> LoadMetricsClientInfo() { |
- return scoped_ptr<metrics::ClientInfo>(); |
+std::unique_ptr<metrics::ClientInfo> LoadMetricsClientInfo() { |
+ return std::unique_ptr<metrics::ClientInfo>(); |
} |
} // namespace |
@@ -38,14 +39,14 @@ IOSChromeMetricsServicesManagerClient::IOSChromeMetricsServicesManagerClient( |
IOSChromeMetricsServicesManagerClient:: |
~IOSChromeMetricsServicesManagerClient() = default; |
-scoped_ptr<rappor::RapporService> |
+std::unique_ptr<rappor::RapporService> |
IOSChromeMetricsServicesManagerClient::CreateRapporService() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- return make_scoped_ptr(new rappor::RapporService( |
+ return base::WrapUnique(new rappor::RapporService( |
local_state_, base::Bind(&::IsOffTheRecordSessionActive))); |
} |
-scoped_ptr<variations::VariationsService> |
+std::unique_ptr<variations::VariationsService> |
IOSChromeMetricsServicesManagerClient::CreateVariationsService() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
@@ -53,12 +54,12 @@ IOSChromeMetricsServicesManagerClient::CreateVariationsService() { |
// a dummy value for the name of the switch that disables background |
// networking. |
return variations::VariationsService::Create( |
- make_scoped_ptr(new IOSChromeVariationsServiceClient), local_state_, |
+ base::WrapUnique(new IOSChromeVariationsServiceClient), local_state_, |
GetMetricsStateManager(), "dummy-disable-background-switch", |
::CreateUIStringOverrider()); |
} |
-scoped_ptr<metrics::MetricsServiceClient> |
+std::unique_ptr<metrics::MetricsServiceClient> |
IOSChromeMetricsServicesManagerClient::CreateMetricsServiceClient() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
return IOSChromeMetricsServiceClient::Create(GetMetricsStateManager(), |