Index: chrome/browser/metrics/chrome_metrics_services_manager_client.cc |
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc |
index 5e6b5a3063c428ade91d94477c6d45de369695b3..64cb51ccae3868329392e79e58f1db66142ebad2 100644 |
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc |
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc |
@@ -6,6 +6,7 @@ |
#include "base/command_line.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
#include "chrome/browser/metrics/chrome_metrics_service_client.h" |
@@ -42,23 +43,23 @@ ChromeMetricsServicesManagerClient::ChromeMetricsServicesManagerClient( |
ChromeMetricsServicesManagerClient::~ChromeMetricsServicesManagerClient() {} |
-scoped_ptr<rappor::RapporService> |
+std::unique_ptr<rappor::RapporService> |
ChromeMetricsServicesManagerClient::CreateRapporService() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- return make_scoped_ptr(new rappor::RapporService( |
+ return base::WrapUnique(new rappor::RapporService( |
local_state_, base::Bind(&chrome::IsOffTheRecordSessionActive))); |
} |
-scoped_ptr<variations::VariationsService> |
+std::unique_ptr<variations::VariationsService> |
ChromeMetricsServicesManagerClient::CreateVariationsService() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
return variations::VariationsService::Create( |
- make_scoped_ptr(new ChromeVariationsServiceClient()), local_state_, |
+ base::WrapUnique(new ChromeVariationsServiceClient()), local_state_, |
GetMetricsStateManager(), switches::kDisableBackgroundNetworking, |
chrome_variations::CreateUIStringOverrider()); |
} |
-scoped_ptr<metrics::MetricsServiceClient> |
+std::unique_ptr<metrics::MetricsServiceClient> |
ChromeMetricsServicesManagerClient::CreateMetricsServiceClient() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
return ChromeMetricsServiceClient::Create(GetMetricsStateManager(), |