Index: ios/chrome/browser/net/proxy_service_factory.cc |
diff --git a/ios/chrome/browser/net/proxy_service_factory.cc b/ios/chrome/browser/net/proxy_service_factory.cc |
index f0180bb2763e4f66aa9e0fef0b6ae498bfefec6b..9ca7382d5baf604d32182e23b14118945277bf5f 100644 |
--- a/ios/chrome/browser/net/proxy_service_factory.cc |
+++ b/ios/chrome/browser/net/proxy_service_factory.cc |
@@ -6,6 +6,7 @@ |
#include <utility> |
+#include "base/memory/ptr_util.h" |
#include "components/proxy_config/pref_proxy_config_tracker_impl.h" |
#include "ios/web/public/web_thread.h" |
#include "net/proxy/proxy_config_service.h" |
@@ -14,9 +15,9 @@ |
namespace ios { |
// static |
-scoped_ptr<net::ProxyConfigService> |
+std::unique_ptr<net::ProxyConfigService> |
ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) { |
- scoped_ptr<net::ProxyConfigService> base_service( |
+ std::unique_ptr<net::ProxyConfigService> base_service( |
net::ProxyService::CreateSystemProxyConfigService( |
web::WebThread::GetTaskRunnerForThread(web::WebThread::IO), |
web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE))); |
@@ -24,33 +25,33 @@ ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) { |
} |
// static |
-scoped_ptr<PrefProxyConfigTracker> |
+std::unique_ptr<PrefProxyConfigTracker> |
ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
PrefService* browser_state_prefs, |
PrefService* local_state_prefs) { |
- return make_scoped_ptr(new PrefProxyConfigTrackerImpl( |
+ return base::WrapUnique(new PrefProxyConfigTrackerImpl( |
browser_state_prefs, |
web::WebThread::GetTaskRunnerForThread(web::WebThread::IO))); |
} |
// static |
-scoped_ptr<PrefProxyConfigTracker> |
+std::unique_ptr<PrefProxyConfigTracker> |
ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
PrefService* local_state_prefs) { |
- return make_scoped_ptr(new PrefProxyConfigTrackerImpl( |
+ return base::WrapUnique(new PrefProxyConfigTrackerImpl( |
local_state_prefs, |
web::WebThread::GetTaskRunnerForThread(web::WebThread::IO))); |
} |
// static |
-scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService( |
+std::unique_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService( |
net::NetLog* net_log, |
net::URLRequestContext* context, |
net::NetworkDelegate* network_delegate, |
- scoped_ptr<net::ProxyConfigService> proxy_config_service, |
+ std::unique_ptr<net::ProxyConfigService> proxy_config_service, |
bool quick_check_enabled) { |
DCHECK_CURRENTLY_ON(web::WebThread::IO); |
- scoped_ptr<net::ProxyService> proxy_service( |
+ std::unique_ptr<net::ProxyService> proxy_service( |
net::ProxyService::CreateUsingSystemProxyResolver( |
std::move(proxy_config_service), 0, net_log)); |
proxy_service->set_quick_check_enabled(quick_check_enabled); |