Fixing flakiness of TestDetectUnresolvedProxy.

webrtc/base/autodetectproxy.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 57 matching lines @@
   // TODO: If we found a proxy, try to use it to verify that it
   // works by sending a request to server_url. This could either be
   // done here or by the HttpPortAllocator.
 }
 
 void AutoDetectProxy::OnMessage(Message *msg) {
   if (MSG_UNRESOLVABLE == msg->message_id) {
     // If we can't resolve the proxy, skip straight to failure.
     Complete(PROXY_UNKNOWN);
   } else if (MSG_TIMEOUT == msg->message_id) {
-    OnCloseEvent(socket_, ETIMEDOUT);
+    OnTimeout();
   } else {
     // This must be the ST_MSG_WORKER_DONE message that deletes the
     // AutoDetectProxy object. We have observed crashes within this stack that
     // seem to be highly reproducible for a small subset of users and thus are
     // probably correlated with a specific proxy setting, so copy potentially
     // relevant information onto the stack to make it available in Windows
     // minidumps.
 
     // Save the user agent and the number of auto-detection passes that we
     // needed.
@@ skipping 183 matching lines @@
       break;
     default:
       ASSERT(false);
       return;
   }
 
   ++next_;
   Next();
 }
 
+void AutoDetectProxy::OnTimeout() {
+  LOG(LS_VERBOSE) << "Timed out waiting for AsyncResolver.";
+  // If a resolver timed out we shouldn't try to use it again since it may be
+  // in the middle of resolving the last address.
+  if (resolver_) {
+    resolver_->SignalDone.disconnect(this);
+    resolver_->Destroy(false);
+    resolver_ = nullptr;
+  }
+  ++next_;
+  Next();
+}
+
 void AutoDetectProxy::OnCloseEvent(AsyncSocket * socket, int error) {
   LOG(LS_VERBOSE) << "AutoDetectProxy closed with error: " << error;
   ++next_;
   Next();
 }
 
 }  // namespace rtc