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

Unified Diff: ios/chrome/browser/application_context_impl.cc

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/application_context_impl.cc
diff --git a/ios/chrome/browser/application_context_impl.cc b/ios/chrome/browser/application_context_impl.cc
index 82d75af3f4ab0812b378c11427f74004c7b1815d..dbb1527fe10bc22f5d031d1143aef2231d98db38 100644
--- a/ios/chrome/browser/application_context_impl.cc
+++ b/ios/chrome/browser/application_context_impl.cc
@@ -11,6 +11,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/time/default_clock.h"
#include "base/time/default_tick_clock.h"
@@ -224,7 +225,7 @@ ApplicationContextImpl::GetMetricsServicesManager() {
DCHECK(thread_checker_.CalledOnValidThread());
if (!metrics_services_manager_) {
metrics_services_manager_.reset(
- new metrics_services_manager::MetricsServicesManager(make_scoped_ptr(
+ new metrics_services_manager::MetricsServicesManager(base::WrapUnique(
new IOSChromeMetricsServicesManagerClient(GetLocalState()))));
}
return metrics_services_manager_.get();
@@ -255,8 +256,8 @@ ApplicationContextImpl::GetNetworkTimeTracker() {
DCHECK(thread_checker_.CalledOnValidThread());
if (!network_time_tracker_) {
network_time_tracker_.reset(new network_time::NetworkTimeTracker(
- make_scoped_ptr(new base::DefaultClock),
- make_scoped_ptr(new base::DefaultTickClock), GetLocalState()));
+ base::WrapUnique(new base::DefaultClock),
+ base::WrapUnique(new base::DefaultTickClock), GetLocalState()));
}
return network_time_tracker_.get();
}
@@ -362,7 +363,7 @@ void ApplicationContextImpl::CreateGCMDriver() {
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
gcm_driver_ = gcm::CreateGCMDriverDesktop(
- make_scoped_ptr(new gcm::GCMClientFactory), GetLocalState(), store_path,
+ base::WrapUnique(new gcm::GCMClientFactory), GetLocalState(), store_path,
GetSystemURLRequestContext(), ::GetChannel(),
web::WebThread::GetTaskRunnerForThread(web::WebThread::UI),
web::WebThread::GetTaskRunnerForThread(web::WebThread::IO),

Powered by Google App Engine
This is Rietveld 408576698