Index: net/proxy/proxy_service.h |
=================================================================== |
--- net/proxy/proxy_service.h (revision 41689) |
+++ net/proxy/proxy_service.h (working copy) |
@@ -40,7 +40,8 @@ |
// 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 @@ |
// 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 @@ |
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 @@ |
// |proxy_resolver_| must outlive |init_proxy_resolver_|. |
scoped_ptr<InitProxyResolver> 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. |