From 5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Wed, 28 Apr 2010 20:12:27 +0000 Subject: Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing NULL in place of a const BoundNetLog&. BUG=37421 Review URL: http://codereview.chromium.org/1783008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45851 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_service.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'net/proxy/proxy_service.h') diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index bf176c8..49c7979 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -39,9 +39,11 @@ class ProxyService : public base::RefCountedThreadSafe, // 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 @@ class ProxyService : public base::RefCountedThreadSafe, // |proxy_resolver_| must outlive |init_proxy_resolver_|. scoped_ptr 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. -- cgit v1.1