OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 NET_PROXY_PROXY_SERVICE_V8_H_ | 5 #ifndef NET_PROXY_PROXY_SERVICE_V8_H_ |
6 #define NET_PROXY_PROXY_SERVICE_V8_H_ | 6 #define NET_PROXY_PROXY_SERVICE_V8_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/scoped_ptr.h" |
9 #include "net/base/net_export.h" | 10 #include "net/base/net_export.h" |
10 | 11 |
11 namespace net { | 12 namespace net { |
12 | 13 |
13 class DhcpProxyScriptFetcher; | 14 class DhcpProxyScriptFetcher; |
14 class HostResolver; | 15 class HostResolver; |
15 class NetLog; | 16 class NetLog; |
16 class NetworkDelegate; | 17 class NetworkDelegate; |
17 class ProxyConfigService; | 18 class ProxyConfigService; |
18 class ProxyScriptFetcher; | 19 class ProxyScriptFetcher; |
(...skipping 12 matching lines...) Expand all Loading... |
31 // |host_resolver| points to the host resolving dependency the PAC script | 32 // |host_resolver| points to the host resolving dependency the PAC script |
32 // should use for any DNS queries. It must remain valid throughout the | 33 // should use for any DNS queries. It must remain valid throughout the |
33 // lifetime of the ProxyService. | 34 // lifetime of the ProxyService. |
34 // | 35 // |
35 // ########################################################################## | 36 // ########################################################################## |
36 // # See the warnings in net/proxy/proxy_resolver_v8.h describing the | 37 // # See the warnings in net/proxy/proxy_resolver_v8.h describing the |
37 // # multi-threading model. In order for this to be safe to use, *ALL* the | 38 // # multi-threading model. In order for this to be safe to use, *ALL* the |
38 // # other V8's running in the process must use v8::Locker. | 39 // # other V8's running in the process must use v8::Locker. |
39 // ########################################################################## | 40 // ########################################################################## |
40 NET_EXPORT ProxyService* CreateProxyServiceUsingV8ProxyResolver( | 41 NET_EXPORT ProxyService* CreateProxyServiceUsingV8ProxyResolver( |
41 ProxyConfigService* proxy_config_service, | 42 scoped_ptr<ProxyConfigService> proxy_config_service, |
42 ProxyScriptFetcher* proxy_script_fetcher, | 43 ProxyScriptFetcher* proxy_script_fetcher, |
43 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, | 44 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, |
44 HostResolver* host_resolver, | 45 HostResolver* host_resolver, |
45 NetLog* net_log, | 46 NetLog* net_log, |
46 NetworkDelegate* network_delegate); | 47 NetworkDelegate* network_delegate); |
47 | 48 |
48 } // namespace net | 49 } // namespace net |
49 | 50 |
50 #endif // NET_PROXY_PROXY_SERVICE_V8_H_ | 51 #endif // NET_PROXY_PROXY_SERVICE_V8_H_ |
OLD | NEW |