| Index: net/proxy/proxy_resolver_factory_mojo.cc
|
| diff --git a/net/proxy/proxy_resolver_factory_mojo.cc b/net/proxy/proxy_resolver_factory_mojo.cc
|
| index 57504f0c75f8b9fcf30fe7167a1c6e0474bba247..4e48b67a057dbd7febd46e6718ac3c18b1d46104 100644
|
| --- a/net/proxy/proxy_resolver_factory_mojo.cc
|
| +++ b/net/proxy/proxy_resolver_factory_mojo.cc
|
| @@ -51,7 +51,7 @@ class ClientMixin : public ClientInterface {
|
| ClientMixin(HostResolver* host_resolver,
|
| ProxyResolverErrorObserver* error_observer,
|
| NetLog* net_log,
|
| - const BoundNetLog& bound_net_log)
|
| + const NetLogWithSource& bound_net_log)
|
| : host_resolver_(host_resolver, bound_net_log),
|
| error_observer_(error_observer),
|
| net_log_(net_log),
|
| @@ -90,7 +90,7 @@ class ClientMixin : public ClientInterface {
|
| MojoHostResolverImpl host_resolver_;
|
| ProxyResolverErrorObserver* const error_observer_;
|
| NetLog* const net_log_;
|
| - const BoundNetLog bound_net_log_;
|
| + const NetLogWithSource bound_net_log_;
|
| };
|
|
|
| // Implementation of ProxyResolver that connects to a Mojo service to evaluate
|
| @@ -120,7 +120,7 @@ class ProxyResolverMojo : public ProxyResolver {
|
| ProxyInfo* results,
|
| const net::CompletionCallback& callback,
|
| RequestHandle* request,
|
| - const BoundNetLog& net_log) override;
|
| + const NetLogWithSource& net_log) override;
|
| void CancelRequest(RequestHandle request) override;
|
| LoadState GetLoadState(RequestHandle request) const override;
|
|
|
| @@ -157,7 +157,7 @@ class ProxyResolverMojo::Job
|
| const GURL& url,
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| - const BoundNetLog& net_log);
|
| + const NetLogWithSource& net_log);
|
| ~Job() override;
|
|
|
| // Cancels the job and prevents the callback from being run.
|
| @@ -188,7 +188,7 @@ ProxyResolverMojo::Job::Job(ProxyResolverMojo* resolver,
|
| const GURL& url,
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| - const BoundNetLog& net_log)
|
| + const NetLogWithSource& net_log)
|
| : ClientMixin<interfaces::ProxyResolverRequestClient>(
|
| resolver->host_resolver_,
|
| resolver->error_observer_.get(),
|
| @@ -285,7 +285,7 @@ int ProxyResolverMojo::GetProxyForURL(const GURL& url,
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| RequestHandle* request,
|
| - const BoundNetLog& net_log) {
|
| + const NetLogWithSource& net_log) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| if (!mojo_proxy_resolver_ptr_)
|
| @@ -319,7 +319,7 @@ LoadState ProxyResolverMojo::GetLoadState(RequestHandle request) const {
|
| //
|
| // Note: a Job instance is not tied to a particular resolve request, and hence
|
| // there is no per-request logging to be done (any netlog events are only sent
|
| -// globally) so this always uses an empty BoundNetLog.
|
| +// globally) so this always uses an empty NetLogWithSource.
|
| class ProxyResolverFactoryMojo::Job
|
| : public ClientMixin<interfaces::ProxyResolverFactoryRequestClient>,
|
| public ProxyResolverFactory::Request {
|
| @@ -333,7 +333,7 @@ class ProxyResolverFactoryMojo::Job
|
| factory->host_resolver_,
|
| error_observer.get(),
|
| factory->net_log_,
|
| - BoundNetLog()),
|
| + NetLogWithSource()),
|
| factory_(factory),
|
| resolver_(resolver),
|
| callback_(callback),
|
|
|