| Index: net/proxy/mojo_proxy_resolver_factory_impl.cc
|
| diff --git a/net/proxy/mojo_proxy_resolver_factory_impl.cc b/net/proxy/mojo_proxy_resolver_factory_impl.cc
|
| index 52082bc649fbab80056b9cd1ee6f2a661171f0f3..b44652a3f720590590402aeba66aecc9b9ce176a 100644
|
| --- a/net/proxy/mojo_proxy_resolver_factory_impl.cc
|
| +++ b/net/proxy/mojo_proxy_resolver_factory_impl.cc
|
| @@ -14,10 +14,11 @@ namespace net {
|
| namespace {
|
|
|
| scoped_ptr<ProxyResolver> CreateDefaultProxyResolver(
|
| - HostResolver* host_resolver) {
|
| + HostResolver* host_resolver,
|
| + const LoadStateChangedCallback<ProxyResolver::RequestHandle>& callback) {
|
| ProxyResolverV8::EnsureIsolateCreated();
|
| return make_scoped_ptr(
|
| - new ProxyResolverV8Tracing(host_resolver, nullptr, nullptr));
|
| + new ProxyResolverV8Tracing(host_resolver, nullptr, nullptr, callback));
|
| }
|
|
|
| // A class to manage the lifetime of a MojoProxyResolverImpl and a
|
| @@ -34,6 +35,9 @@ class MojoProxyResolverHolder : public mojo::ErrorHandler {
|
| // mojo::ErrorHandler override.
|
| void OnConnectionError() override;
|
|
|
| + void LoadStateChanged(ProxyResolver::RequestHandle handle,
|
| + LoadState load_state);
|
| +
|
| HostResolverMojo host_resolver_;
|
| MojoProxyResolverImpl proxy_resolver_;
|
| mojo::Binding<interfaces::ProxyResolver> binding_;
|
| @@ -48,7 +52,10 @@ MojoProxyResolverHolder::MojoProxyResolverHolder(
|
| : host_resolver_(host_resolver.Pass(),
|
| base::Bind(&MojoProxyResolverHolder::OnConnectionError,
|
| base::Unretained(this))),
|
| - proxy_resolver_(proxy_resolver_factory.Run(&host_resolver_)),
|
| + proxy_resolver_(proxy_resolver_factory.Run(
|
| + &host_resolver_,
|
| + base::Bind(&MojoProxyResolverHolder::LoadStateChanged,
|
| + base::Unretained(this)))),
|
| binding_(&proxy_resolver_, request.Pass()) {
|
| binding_.set_error_handler(this);
|
| }
|
| @@ -57,6 +64,12 @@ void MojoProxyResolverHolder::OnConnectionError() {
|
| delete this;
|
| }
|
|
|
| +void MojoProxyResolverHolder::LoadStateChanged(
|
| + ProxyResolver::RequestHandle handle,
|
| + LoadState load_state) {
|
| + proxy_resolver_.LoadStateChanged(handle, load_state);
|
| +}
|
| +
|
| } // namespace
|
|
|
| MojoProxyResolverFactoryImpl::MojoProxyResolverFactoryImpl(
|
|
|