| Index: ios/chrome/browser/net/proxy_service_factory.h
|
| diff --git a/ios/chrome/browser/net/proxy_service_factory.h b/ios/chrome/browser/net/proxy_service_factory.h
|
| index 7710680c192153906aaef07ed7b23975cb6c0b9f..a7cefa18e9d956a05bb7b5e5f5be77bcaed1c877 100644
|
| --- a/ios/chrome/browser/net/proxy_service_factory.h
|
| +++ b/ios/chrome/browser/net/proxy_service_factory.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
|
| #define IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| class PrefProxyConfigTracker;
|
| class PrefService;
|
| @@ -24,25 +25,25 @@ namespace ios {
|
| class ProxyServiceFactory {
|
| public:
|
| // Creates a ProxyConfigService that delivers the system preferences.
|
| - static scoped_ptr<net::ProxyConfigService> CreateProxyConfigService(
|
| + static std::unique_ptr<net::ProxyConfigService> CreateProxyConfigService(
|
| PrefProxyConfigTracker* tracker);
|
|
|
| // Creates a PrefProxyConfigTracker that tracks browser state preferences.
|
| - static scoped_ptr<PrefProxyConfigTracker>
|
| + static std::unique_ptr<PrefProxyConfigTracker>
|
| CreatePrefProxyConfigTrackerOfProfile(PrefService* browser_state_prefs,
|
| PrefService* local_state_prefs);
|
|
|
| // Creates a PrefProxyConfigTracker that tracks local state only. This tracker
|
| // should be used for the system request context.
|
| - static scoped_ptr<PrefProxyConfigTracker>
|
| + static std::unique_ptr<PrefProxyConfigTracker>
|
| CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs);
|
|
|
| // Create a proxy service.
|
| - static scoped_ptr<net::ProxyService> CreateProxyService(
|
| + static std::unique_ptr<net::ProxyService> 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);
|
|
|
| private:
|
|
|