Index: net/proxy/multi_threaded_proxy_resolver.cc |
diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc |
index de739133848e39f9008b68b529110fdc423966ff..5d014e60265b6760e3f1bd9406282f8fa68e5a82 100644 |
--- a/net/proxy/multi_threaded_proxy_resolver.cc |
+++ b/net/proxy/multi_threaded_proxy_resolver.cc |
@@ -337,11 +337,6 @@ void MultiThreadedProxyResolver::Executor::OnJobCompleted(Job* job) { |
void MultiThreadedProxyResolver::Executor::Destroy() { |
DCHECK(coordinator_); |
- // Give the resolver an opportunity to shutdown from THIS THREAD before |
- // joining on the resolver thread. This allows certain implementations |
- // to avoid deadlocks. |
- resolver_->Shutdown(); |
- |
{ |
// See http://crbug.com/69710. |
base::ThreadRestrictions::ScopedAllowIO allow_io; |
@@ -462,19 +457,9 @@ void MultiThreadedProxyResolver::CancelRequest(RequestHandle req) { |
LoadState MultiThreadedProxyResolver::GetLoadState(RequestHandle req) const { |
DCHECK(CalledOnValidThread()); |
DCHECK(req); |
- |
- Job* job = reinterpret_cast<Job*>(req); |
- if (job->executor()) |
- return job->executor()->resolver()->GetLoadStateThreadSafe(NULL); |
return LOAD_STATE_RESOLVING_PROXY_FOR_URL; |
} |
-LoadState MultiThreadedProxyResolver::GetLoadStateThreadSafe( |
- RequestHandle req) const { |
- NOTIMPLEMENTED(); |
- return LOAD_STATE_IDLE; |
-} |
- |
void MultiThreadedProxyResolver::CancelSetPacScript() { |
DCHECK(CalledOnValidThread()); |
DCHECK_EQ(0u, pending_jobs_.size()); |