Return DNS addresses when address can be resolved synchronously.

content/browser/renderer_host/p2p/socket_dispatcher_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/browser/resource_context.h"
@@ skipping 30 matching lines @@
       done_callback_.Run(net::IPAddressNumber());
       return;
     }
 
     // Add period at the end to make sure that we only resolve
     // fully-qualified names.
     if (host_name_.at(host_name_.size() - 1) != '.')
       host_name_ = host_name_ + '.';
 
     net::HostResolver::RequestInfo info(net::HostPortPair(host_name_, 0));
-    resolver_.Resolve(info, &addresses_, &completion_callback_,
-                      net::BoundNetLog());
+    int result = resolver_.Resolve(info, &addresses_, &completion_callback_,
+                                   net::BoundNetLog());
+    if (result != net::ERR_IO_PENDING)
+      OnDone(result);
   }
 
   int32 routing_id() { return routing_id_; }
   int32 request_id() { return request_id_; }
 
  private:
   void OnDone(int result) {
     if (result != net::OK) {
       LOG(ERROR) << "Failed to resolve address for " << host_name_
                  << ", errorcode: " << result;
@@ skipping 129 matching lines @@
        it != notifications_routing_ids_.end(); ++it) {
     Send(new P2PMsg_NetworkListChanged(*it, list));
   }
 }
 
 void P2PSocketDispatcherHost::OnGetHostAddress(const IPC::Message& msg,
                                                const std::string& host_name,
                                                int32 request_id) {
   DnsRequest* request = new DnsRequest(
       msg.routing_id(), request_id, resource_context_->host_resolver());
+  dns_requests_.insert(request);
   request->Resolve(host_name, base::Bind(
       &P2PSocketDispatcherHost::OnAddressResolved,
       base::Unretained(this), request));
-  dns_requests_.insert(request);
 }
 
 void P2PSocketDispatcherHost::OnAddressResolved(
     DnsRequest* request,
     const net::IPAddressNumber& result) {
   Send(new P2PMsg_GetHostAddressResult(
       request->routing_id(), request->request_id(), result));
 
   dns_requests_.erase(request);
   delete request;
@@ skipping 56 matching lines @@
                                               int socket_id) {
   SocketsMap::iterator it = sockets_.find(
       ExtendedSocketId(msg.routing_id(), socket_id));
   if (it != sockets_.end()) {
     delete it->second;
     sockets_.erase(it);
   } else {
     LOG(ERROR) << "Received P2PHostMsg_DestroySocket for invalid socket_id.";
   }
 }