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

Unified Diff: components/proxy_config/pref_proxy_config_tracker_impl.cc

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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: components/proxy_config/pref_proxy_config_tracker_impl.cc
diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc
index 378923e5b7aa77ad4b3ee5c27d73a8c56891cf5c..af9ce21453292f4b978e8c6664a562a309d6b9fc 100644
--- a/components/proxy_config/pref_proxy_config_tracker_impl.cc
+++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc
@@ -210,9 +210,9 @@ PrefProxyConfigTrackerImpl::~PrefProxyConfigTrackerImpl() {
DCHECK(pref_service_ == NULL);
}
-scoped_ptr<net::ProxyConfigService>
+std::unique_ptr<net::ProxyConfigService>
PrefProxyConfigTrackerImpl::CreateTrackingProxyConfigService(
- scoped_ptr<net::ProxyConfigService> base_service) {
+ std::unique_ptr<net::ProxyConfigService> base_service) {
proxy_config_service_impl_ =
new ProxyConfigServiceImpl(base_service.release());
VLOG(1) << this << ": set chrome proxy config service to "
@@ -220,7 +220,7 @@ PrefProxyConfigTrackerImpl::CreateTrackingProxyConfigService(
if (proxy_config_service_impl_ && update_pending_)
OnProxyConfigChanged(config_state_, pref_config_);
- return scoped_ptr<net::ProxyConfigService>(proxy_config_service_impl_);
+ return std::unique_ptr<net::ProxyConfigService>(proxy_config_service_impl_);
}
void PrefProxyConfigTrackerImpl::DetachFromPrefService() {

Powered by Google App Engine
This is Rietveld 408576698