| Index: remoting/jingle_glue/chromium_socket_factory.cc
|
| diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/jingle_glue/chromium_socket_factory.cc
|
| index 12e911c3f662d19c66af08dc5df3abb073037e7c..520dc8a2fd52670d170b7cf42a5c9fb32b6f23e9 100644
|
| --- a/remoting/jingle_glue/chromium_socket_factory.cc
|
| +++ b/remoting/jingle_glue/chromium_socket_factory.cc
|
| @@ -13,7 +13,7 @@
|
| #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 {
|
|
|
| @@ -35,29 +35,6 @@ bool IsTransientError(int error) {
|
| 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();
|
| @@ -398,7 +375,7 @@ ChromiumPacketSocketFactory::CreateClientTcpSocket(
|
|
|
| talk_base::AsyncResolverInterface*
|
| ChromiumPacketSocketFactory::CreateAsyncResolver() {
|
| - return new DummyAsyncResolver();
|
| + return new talk_base::AsyncResolver();
|
| }
|
|
|
| } // namespace remoting
|
|
|