| Index: net/proxy/proxy_service_mojo.h
|
| diff --git a/net/proxy/proxy_service_mojo.h b/net/proxy/proxy_service_mojo.h
|
| index 8757421ef6a9e3c2866e37567958c9651ac77050..d7faf08400de225e1c5f489041b1ea29e8a06e23 100644
|
| --- a/net/proxy/proxy_service_mojo.h
|
| +++ b/net/proxy/proxy_service_mojo.h
|
| @@ -6,13 +6,14 @@
|
| #define NET_PROXY_PROXY_SERVICE_MOJO_H_
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "net/proxy/dhcp_proxy_script_fetcher.h"
|
|
|
| namespace net {
|
| namespace interfaces {
|
| class ProxyResolverFactory;
|
| }
|
|
|
| -class DhcpProxyScriptFetcher;
|
| class HostResolver;
|
| class MojoProxyResolverFactory;
|
| class NetLog;
|
| @@ -30,8 +31,7 @@ class ProxyService;
|
| // any PAC scripts. The resulting ProxyService will take ownership of it.
|
| //
|
| // |dhcp_proxy_script_fetcher| specifies the dependency to use for attempting
|
| -// to retrieve the most appropriate PAC script configured in DHCP. The
|
| -// resulting ProxyService will take ownership of it.
|
| +// to retrieve the most appropriate PAC script configured in DHCP.
|
| //
|
| // |host_resolver| points to the host resolving dependency the PAC script
|
| // should use for any DNS queries. It must remain valid throughout the
|
| @@ -40,7 +40,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
|
| MojoProxyResolverFactory* mojo_proxy_factory,
|
| ProxyConfigService* proxy_config_service,
|
| ProxyScriptFetcher* proxy_script_fetcher,
|
| - DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
|
| + scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher,
|
| HostResolver* host_resolver,
|
| NetLog* net_log,
|
| NetworkDelegate* network_delegate);
|
| @@ -56,7 +56,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
|
| ProxyService* CreateProxyServiceUsingMojoInProcess(
|
| ProxyConfigService* proxy_config_service,
|
| ProxyScriptFetcher* proxy_script_fetcher,
|
| - DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
|
| + scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher,
|
| HostResolver* host_resolver,
|
| NetLog* net_log,
|
| NetworkDelegate* network_delegate);
|
|
|