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

Unified Diff: ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add header 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: 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 5c948997da222ce058819ab86e0d43e3ec661fe2..6b80a0e701f15dfc83fa3e4d58603b9a01929f2c 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
@@ -40,14 +41,14 @@ IOSChromeMetricsServicesManagerClient::
ios::GetChromeBrowserProvider()->OnMetricsServicesManagerClientDestroyed();
}
-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());
@@ -55,12 +56,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(),

Powered by Google App Engine
This is Rietveld 408576698