Fix host STUN. Use talk_base::AsyncResolver.

remoting/jingle_glue/chromium_socket_factory.cc

 // Copyright (c) 2012 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 "remoting/jingle_glue/chromium_socket_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "jingle/glue/utils.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/udp/udp_server_socket.h"
 #include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
-#include "third_party/libjingle/source/talk/base/asyncresolverinterface.h"
+#include "third_party/libjingle/source/talk/base/nethelpers.h"
 
 namespace remoting {
 
 namespace {
 
 // Size of the buffer to allocate for RecvFrom().
 const int kReceiveBufferSize = 65536;
 
 // Maximum amount of data in the send buffers. This is necessary to
 // prevent out-of-memory crashes if the caller sends data faster than
 // Pepper's UDP API can handle it. This maximum should never be
 // reached under normal conditions.
 const int kMaxSendBufferSize = 256 * 1024;
 
 // Defines set of transient errors. These errors are ignored when we get them
 // from sendto() calls.
 bool IsTransientError(int error) {
   return error == net::ERR_ADDRESS_UNREACHABLE ||
       error == net::ERR_ADDRESS_INVALID;
 }
 
-// TODO(lambroslambrou): Move STUN/relay address resolution from
-// PepperPortAllocator to this class.
-class DummyAsyncResolver : public talk_base::AsyncResolverInterface {
- public:
-  DummyAsyncResolver() {}
-  virtual ~DummyAsyncResolver() {}
-  virtual void Start(const talk_base::SocketAddress& addr) OVERRIDE {}
-  virtual bool GetResolvedAddress(
-      int family,
-      talk_base::SocketAddress* addr) const OVERRIDE {
-    return false;
-  }
-  virtual int GetError() const OVERRIDE {
-    return 0;
-  }
-  virtual void Destroy(bool wait) OVERRIDE {
-    delete this;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DummyAsyncResolver);
-};
-
 class UdpPacketSocket : public talk_base::AsyncPacketSocket {
  public:
   UdpPacketSocket();
   virtual ~UdpPacketSocket();
 
   bool Init(const talk_base::SocketAddress& local_address,
             int min_port, int max_port);
 
   // talk_base::AsyncPacketSocket interface.
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
@@ skipping 320 matching lines @@
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
       int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
 }
 
 talk_base::AsyncResolverInterface*
 ChromiumPacketSocketFactory::CreateAsyncResolver() {
-  return new DummyAsyncResolver();
+  return new talk_base::AsyncResolver();
 }
 
 }  // namespace remoting