| Index: net/proxy/proxy_service.h
|
| ===================================================================
|
| --- net/proxy/proxy_service.h (revision 45843)
|
| +++ net/proxy/proxy_service.h (working copy)
|
| @@ -39,9 +39,11 @@
|
| // If |network_change_notifier| is non-NULL, the proxy service will register
|
| // with it to detect when the network setup has changed. This is used to
|
| // decide when to re-configure the proxy discovery.
|
| + // |net_log| is a possibly NULL destination to send log events to. It must
|
| + // remain alive for the lifetime of this ProxyService.
|
| ProxyService(ProxyConfigService* config_service, ProxyResolver* resolver,
|
| NetworkChangeNotifier* network_change_notifier,
|
| - const BoundNetLog& init_proxy_resolver_log);
|
| + NetLog* net_log);
|
|
|
| // Used internally to handle PAC queries.
|
| // TODO(eroman): consider naming this simply "Request".
|
| @@ -281,8 +283,9 @@
|
| // |proxy_resolver_| must outlive |init_proxy_resolver_|.
|
| scoped_ptr<InitProxyResolver> init_proxy_resolver_;
|
|
|
| - // Log for events generated by |init_proxy_resolver_|.
|
| - BoundNetLog init_proxy_resolver_log_;
|
| + // This is the log where any events generated by |init_proxy_resolver_| are
|
| + // sent to.
|
| + NetLog* net_log_;
|
|
|
| // The (possibly NULL) network change notifier that we use to decide when
|
| // to refetch PAC scripts or re-run WPAD.
|
|
|