| Index: net/proxy/proxy_resolver_mojo.cc
|
| diff --git a/net/proxy/proxy_resolver_mojo.cc b/net/proxy/proxy_resolver_mojo.cc
|
| index c0e38fb26a138a37d53d2ab233fa158894d12730..8512682f1a0d3460b17e945edc685d02c92c7f55 100644
|
| --- a/net/proxy/proxy_resolver_mojo.cc
|
| +++ b/net/proxy/proxy_resolver_mojo.cc
|
| @@ -91,9 +91,6 @@ class ProxyResolverMojo : public ProxyResolver, public mojo::ErrorHandler {
|
| const BoundNetLog& net_log) override;
|
| void CancelRequest(RequestHandle request) override;
|
| LoadState GetLoadState(RequestHandle request) const override;
|
| - void CancelSetPacScript() override;
|
| - int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& pac_script,
|
| - const net::CompletionCallback& callback) override;
|
|
|
| private:
|
| class Job;
|
| @@ -219,8 +216,7 @@ ProxyResolverMojo::ProxyResolverMojo(
|
| scoped_ptr<mojo::Binding<interfaces::HostResolver>> host_resolver_binding,
|
| scoped_ptr<base::ScopedClosureRunner> on_delete_callback_runner,
|
| scoped_ptr<ErrorObserverHolder> error_observer)
|
| - : ProxyResolver(true),
|
| - mojo_proxy_resolver_ptr_(resolver_ptr.Pass()),
|
| + : mojo_proxy_resolver_ptr_(resolver_ptr.Pass()),
|
| mojo_host_resolver_(host_resolver.Pass()),
|
| mojo_host_resolver_binding_(host_resolver_binding.Pass()),
|
| error_observer_(error_observer.Pass()),
|
| @@ -234,17 +230,6 @@ ProxyResolverMojo::~ProxyResolverMojo() {
|
| DCHECK(pending_jobs_.empty());
|
| }
|
|
|
| -void ProxyResolverMojo::CancelSetPacScript() {
|
| - NOTREACHED();
|
| -}
|
| -
|
| -int ProxyResolverMojo::SetPacScript(
|
| - const scoped_refptr<ProxyResolverScriptData>& pac_script,
|
| - const CompletionCallback& callback) {
|
| - NOTREACHED();
|
| - return ERR_NOT_IMPLEMENTED;
|
| -}
|
| -
|
| void ProxyResolverMojo::OnConnectionError() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DVLOG(1) << "ProxyResolverMojo::OnConnectionError";
|
|
|