| Index: net/base/host_resolver_impl.h
|
| ===================================================================
|
| --- net/base/host_resolver_impl.h (revision 57182)
|
| +++ net/base/host_resolver_impl.h (working copy)
|
| @@ -75,16 +75,19 @@
|
| // used (which is SystemHostResolverProc except if overridden).
|
| // |max_jobs| specifies the maximum number of threads that the host resolver
|
| // will use. Use SetPoolConstraints() to specify finer-grain settings.
|
| + //
|
| + // |net_log| must remain valid for the life of the HostResolverImpl.
|
| HostResolverImpl(HostResolverProc* resolver_proc,
|
| HostCache* cache,
|
| - size_t max_jobs);
|
| + size_t max_jobs,
|
| + NetLog* net_log);
|
|
|
| // HostResolver methods:
|
| virtual int Resolve(const RequestInfo& info,
|
| AddressList* addresses,
|
| CompletionCallback* callback,
|
| RequestHandle* out_req,
|
| - const BoundNetLog& net_log);
|
| + const BoundNetLog& source_net_log);
|
| virtual void CancelRequest(RequestHandle req);
|
| virtual void AddObserver(HostResolver::Observer* observer);
|
| virtual void RemoveObserver(HostResolver::Observer* observer);
|
| @@ -154,20 +157,22 @@
|
| const AddressList& addrlist);
|
|
|
| // Called when a request has just been started.
|
| - void OnStartRequest(const BoundNetLog& net_log,
|
| + void OnStartRequest(const BoundNetLog& source_net_log,
|
| + const BoundNetLog& request_net_log,
|
| int request_id,
|
| const RequestInfo& info);
|
|
|
| // Called when a request has just completed (before its callback is run).
|
| - void OnFinishRequest(const BoundNetLog& net_log,
|
| + void OnFinishRequest(const BoundNetLog& source_net_log,
|
| + const BoundNetLog& request_net_log,
|
| int request_id,
|
| const RequestInfo& info,
|
| int net_error,
|
| - int os_error,
|
| - bool was_from_cache);
|
| + int os_error);
|
|
|
| // Called when a request has been cancelled.
|
| - void OnCancelRequest(const BoundNetLog& net_log,
|
| + void OnCancelRequest(const BoundNetLog& source_net_log,
|
| + const BoundNetLog& request_net_log,
|
| int request_id,
|
| const RequestInfo& info);
|
|
|
| @@ -255,6 +260,8 @@
|
| // Any resolver flags that should be added to a request by default.
|
| HostResolverFlags additional_resolver_flags_;
|
|
|
| + NetLog* net_log_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(HostResolverImpl);
|
| };
|
|
|
|
|