| 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 695c64b01faf8b84d9b92d08c1c7ab967e4db6e1..714f211da2fd01ec88548d63f5191743ddb69eb4 100644
|
| --- a/net/proxy/proxy_resolver_factory_mojo.cc
|
| +++ b/net/proxy/proxy_resolver_factory_mojo.cc
|
| @@ -132,7 +132,7 @@ class ProxyResolverMojo::Job : public interfaces::ProxyResolverRequestClient,
|
| void Cancel();
|
|
|
| // Returns the LoadState of this job.
|
| - LoadState load_state() { return load_state_; }
|
| + LoadState load_state() { return LOAD_STATE_RESOLVING_PROXY_FOR_URL; }
|
|
|
| private:
|
| // Overridden from mojo::ErrorHandler:
|
| @@ -142,13 +142,11 @@ class ProxyResolverMojo::Job : public interfaces::ProxyResolverRequestClient,
|
| void ReportResult(
|
| int32_t error,
|
| mojo::Array<interfaces::ProxyServerPtr> proxy_servers) override;
|
| - void LoadStateChanged(int32_t load_state) override;
|
|
|
| ProxyResolverMojo* resolver_;
|
| const GURL url_;
|
| ProxyInfo* results_;
|
| CompletionCallback callback_;
|
| - LoadState load_state_ = LOAD_STATE_RESOLVING_PROXY_FOR_URL;
|
|
|
| base::ThreadChecker thread_checker_;
|
| mojo::Binding<interfaces::ProxyResolverRequestClient> binding_;
|
| @@ -206,10 +204,6 @@ void ProxyResolverMojo::Job::ReportResult(
|
| callback.Run(error);
|
| }
|
|
|
| -void ProxyResolverMojo::Job::LoadStateChanged(int32_t load_state) {
|
| - load_state_ = static_cast<LoadState>(load_state);
|
| -}
|
| -
|
| ProxyResolverMojo::ProxyResolverMojo(
|
| interfaces::ProxyResolverPtr resolver_ptr,
|
| scoped_ptr<interfaces::HostResolver> host_resolver,
|
|
|