OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ | 5 #ifndef IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ |
6 #define IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ | 6 #define IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 | 11 |
11 class PrefProxyConfigTracker; | 12 class PrefProxyConfigTracker; |
12 class PrefService; | 13 class PrefService; |
13 | 14 |
14 namespace net { | 15 namespace net { |
15 class NetLog; | 16 class NetLog; |
16 class NetworkDelegate; | 17 class NetworkDelegate; |
17 class ProxyConfigService; | 18 class ProxyConfigService; |
18 class ProxyService; | 19 class ProxyService; |
19 class URLRequestContext; | 20 class URLRequestContext; |
20 } | 21 } |
21 | 22 |
22 namespace ios { | 23 namespace ios { |
23 | 24 |
24 class ProxyServiceFactory { | 25 class ProxyServiceFactory { |
25 public: | 26 public: |
26 // Creates a ProxyConfigService that delivers the system preferences. | 27 // Creates a ProxyConfigService that delivers the system preferences. |
27 static scoped_ptr<net::ProxyConfigService> CreateProxyConfigService( | 28 static std::unique_ptr<net::ProxyConfigService> CreateProxyConfigService( |
28 PrefProxyConfigTracker* tracker); | 29 PrefProxyConfigTracker* tracker); |
29 | 30 |
30 // Creates a PrefProxyConfigTracker that tracks browser state preferences. | 31 // Creates a PrefProxyConfigTracker that tracks browser state preferences. |
31 static scoped_ptr<PrefProxyConfigTracker> | 32 static std::unique_ptr<PrefProxyConfigTracker> |
32 CreatePrefProxyConfigTrackerOfProfile(PrefService* browser_state_prefs, | 33 CreatePrefProxyConfigTrackerOfProfile(PrefService* browser_state_prefs, |
33 PrefService* local_state_prefs); | 34 PrefService* local_state_prefs); |
34 | 35 |
35 // Creates a PrefProxyConfigTracker that tracks local state only. This tracker | 36 // Creates a PrefProxyConfigTracker that tracks local state only. This tracker |
36 // should be used for the system request context. | 37 // should be used for the system request context. |
37 static scoped_ptr<PrefProxyConfigTracker> | 38 static std::unique_ptr<PrefProxyConfigTracker> |
38 CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs); | 39 CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs); |
39 | 40 |
40 // Create a proxy service. | 41 // Create a proxy service. |
41 static scoped_ptr<net::ProxyService> CreateProxyService( | 42 static std::unique_ptr<net::ProxyService> CreateProxyService( |
42 net::NetLog* net_log, | 43 net::NetLog* net_log, |
43 net::URLRequestContext* context, | 44 net::URLRequestContext* context, |
44 net::NetworkDelegate* network_delegate, | 45 net::NetworkDelegate* network_delegate, |
45 scoped_ptr<net::ProxyConfigService> proxy_config_service, | 46 std::unique_ptr<net::ProxyConfigService> proxy_config_service, |
46 bool quick_check_enabled); | 47 bool quick_check_enabled); |
47 | 48 |
48 private: | 49 private: |
49 DISALLOW_COPY_AND_ASSIGN(ProxyServiceFactory); | 50 DISALLOW_COPY_AND_ASSIGN(ProxyServiceFactory); |
50 }; | 51 }; |
51 | 52 |
52 } // namespace ios | 53 } // namespace ios |
53 | 54 |
54 #endif // IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ | 55 #endif // IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ |
OLD | NEW |