From 4c2464b49571049ad7128343bfafa9abb3be7e0c Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Tue, 16 Mar 2010 21:41:10 +0000 Subject: Move over another legacy "LoadLog-style" event generator to routing its messages through the NetLog. BUG=37421 Review URL: http://codereview.chromium.org/1052002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41768 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_service.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'net/proxy/proxy_service.h') diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 2cf3f95..bf176c8 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -40,7 +40,8 @@ class ProxyService : public base::RefCountedThreadSafe, // with it to detect when the network setup has changed. This is used to // decide when to re-configure the proxy discovery. ProxyService(ProxyConfigService* config_service, ProxyResolver* resolver, - NetworkChangeNotifier* network_change_notifier); + NetworkChangeNotifier* network_change_notifier, + const BoundNetLog& init_proxy_resolver_log); // Used internally to handle PAC queries. // TODO(eroman): consider naming this simply "Request". @@ -108,13 +109,6 @@ class ProxyService : public base::RefCountedThreadSafe, // Tells the resolver to purge any memory it does not need. void PurgeMemory(); - // Returns the log for the most recent WPAD + PAC initialization. - // (This shows how much time was spent downloading and parsing the - // PAC scripts for the current configuration). - const CapturingBoundNetLog& init_proxy_resolver_log() const { - return init_proxy_resolver_log_; - } - // Returns true if we have called UpdateConfig() at least once. bool config_has_been_initialized() const { return config_.id() != ProxyConfig::INVALID_ID; @@ -161,6 +155,7 @@ class ProxyService : public base::RefCountedThreadSafe, bool use_v8_resolver, URLRequestContext* url_request_context, NetworkChangeNotifier* network_change_notifier, + NetLog* net_log, MessageLoop* io_loop); // Convenience method that creates a proxy service using the @@ -286,8 +281,8 @@ class ProxyService : public base::RefCountedThreadSafe, // |proxy_resolver_| must outlive |init_proxy_resolver_|. scoped_ptr init_proxy_resolver_; - // Log from the *last* time |init_proxy_resolver_.Init()| was called, or NULL. - CapturingBoundNetLog init_proxy_resolver_log_; + // Log for events generated by |init_proxy_resolver_|. + BoundNetLog init_proxy_resolver_log_; // The (possibly NULL) network change notifier that we use to decide when // to refetch PAC scripts or re-run WPAD. -- cgit v1.1