| Index: net/proxy/proxy_service.h
|
| diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
|
| index 814647098d6d145f860ef50e68382bd9cd397156..401b635b79262e6388cbb5ade312ef03f2d36d9d 100644
|
| --- a/net/proxy/proxy_service.h
|
| +++ b/net/proxy/proxy_service.h
|
| @@ -28,7 +28,7 @@ namespace net {
|
| class HostResolver;
|
| class InitProxyResolver;
|
| class ProxyResolver;
|
| -class ProxyScriptFetcher;
|
| +class URLProxyScriptFetcher;
|
| class URLRequestContext;
|
|
|
| // This class can be used to resolve the proxy server to use when loading a
|
| @@ -99,8 +99,8 @@ class ProxyService : public base::RefCounted<ProxyService>,
|
| // Sets the ProxyScriptFetcher dependency. This is needed if the ProxyResolver
|
| // is of type ProxyResolverWithoutFetch. ProxyService takes ownership of
|
| // |proxy_script_fetcher|.
|
| - void SetProxyScriptFetcher(ProxyScriptFetcher* proxy_script_fetcher);
|
| - ProxyScriptFetcher* GetProxyScriptFetcher() const;
|
| + void SetProxyScriptFetcher(URLProxyScriptFetcher* proxy_script_fetcher);
|
| + URLProxyScriptFetcher* GetProxyScriptFetcher() const;
|
|
|
| // Tells this ProxyService to start using a new ProxyConfigService to
|
| // retrieve its ProxyConfig from. The new ProxyConfigService will immediately
|
| @@ -171,7 +171,7 @@ class ProxyService : public base::RefCounted<ProxyService>,
|
| static ProxyService* CreateUsingV8ProxyResolver(
|
| ProxyConfigService* proxy_config_service,
|
| size_t num_pac_threads,
|
| - ProxyScriptFetcher* proxy_script_fetcher,
|
| + URLProxyScriptFetcher* proxy_script_fetcher,
|
| HostResolver* host_resolver,
|
| NetLog* net_log);
|
|
|
| @@ -317,7 +317,7 @@ class ProxyService : public base::RefCounted<ProxyService>,
|
| // The fetcher to use when downloading PAC scripts for the ProxyResolver.
|
| // This dependency can be NULL if our ProxyResolver has no need for
|
| // external PAC script fetching.
|
| - scoped_ptr<ProxyScriptFetcher> proxy_script_fetcher_;
|
| + scoped_ptr<URLProxyScriptFetcher> proxy_script_fetcher_;
|
|
|
| // Callback for when |init_proxy_resolver_| is done.
|
| CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
|
|
|