Cancel any outstanding host resolve when calling SOCKSClientSocket::Disconnec...

net/base/host_resolver.cc

Index: net/base/host_resolver.cc
===================================================================
--- net/base/host_resolver.cc	(revision 35690)
+++ net/base/host_resolver.cc	(working copy)
@@ -20,9 +20,7 @@
 }
 
 SingleRequestHostResolver::~SingleRequestHostResolver() {
-  if (cur_request_) {
-    resolver_->CancelRequest(cur_request_);
-  }
+  Cancel();
 }
 
 int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info,
@@ -49,6 +47,13 @@
   return rv;
 }
 
+void SingleRequestHostResolver::Cancel() {
+  if (cur_request_) {
+    resolver_->CancelRequest(cur_request_);
+    cur_request_ = NULL;
+  }
+}
+
 void SingleRequestHostResolver::OnResolveCompletion(int result) {
   DCHECK(cur_request_ && cur_request_callback_);