commit fc5a4f74ac13dc878cb8428a7c19c8bcf0ee8037
author Björn Terelius <terelius@google.com> Wed Oct 06 15:05:33 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Oct 06 15:05:57 2021
tree 9c84e0385e2f0e9aaf6f9dbb1bbce59dad9423ab
parent 3695640504af35c7e9a13efc8c4d6545ed4bf19b

Revert "Use AsyncDnsResolver API in bindings and tests"

This reverts commit a0577605b03da461719ce5b5eb0fb1ed55ad1065.

Reason for revert: Speculative revert due to downstream tests

Original change's description:
> Use AsyncDnsResolver API in bindings and tests
>
> Bug: webrtc:12598
> Change-Id: Ia4db91bf6dcd257cd85f4089dee4c7bbea433216
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234342
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Markus Handell <handellm@webrtc.org>
> Reviewed-by: Markus Handell <handellm@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#35154}

TBR=hta@webrtc.org,handellm@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I57f3ff70b6374e7be670526a90dfb1651e9b1148
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:12598
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234382
Reviewed-by: Björn Terelius <terelius@google.com>
Commit-Queue: Björn Terelius <terelius@google.com>
Cr-Commit-Position: refs/heads/main@{#35157}

p2p/BUILD.gn

diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index d09cab9..3029e0a 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -108,7 +108,6 @@
     "../rtc_base:rtc_numerics",
     "../rtc_base:socket",
     "../rtc_base:socket_address",
-    "../rtc_base:socket_factory",
     "../rtc_base:socket_server",
     "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",

p2p/base/basic_packet_socket_factory.cc

diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc
index 2a53f5e..a53ed96 100644
--- a/p2p/base/basic_packet_socket_factory.cc
+++ b/p2p/base/basic_packet_socket_factory.cc
@@ -14,15 +14,16 @@
 
 #include <string>
 
-#include "api/async_dns_resolver.h"
-#include "api/wrapping_async_dns_resolver.h"
 #include "p2p/base/async_stun_tcp_socket.h"
+#include "rtc_base/async_resolver.h"
 #include "rtc_base/async_tcp_socket.h"
 #include "rtc_base/async_udp_socket.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/socket.h"
 #include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/ssl_adapter.h"
 
 namespace rtc {
@@ -189,10 +190,8 @@
   return tcp_socket;
 }
 
-std::unique_ptr<webrtc::AsyncDnsResolverInterface>
-BasicPacketSocketFactory::CreateAsyncDnsResolver() {
-  return std::make_unique<webrtc::WrappingAsyncDnsResolver>(
-      new AsyncResolver());
+AsyncResolverInterface* BasicPacketSocketFactory::CreateAsyncResolver() {
+  return new AsyncResolver();
 }
 
 int BasicPacketSocketFactory::BindSocket(Socket* socket,

p2p/base/basic_packet_socket_factory.h

diff --git a/p2p/base/basic_packet_socket_factory.h b/p2p/base/basic_packet_socket_factory.h
index 147f513..616d6de 100644
--- a/p2p/base/basic_packet_socket_factory.h
+++ b/p2p/base/basic_packet_socket_factory.h
@@ -11,18 +11,10 @@
 #ifndef P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
 #define P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
 
-#include <stdint.h>
-
-#include <memory>
 #include <string>
 
-#include "api/async_dns_resolver.h"
 #include "api/packet_socket_factory.h"
-#include "rtc_base/async_packet_socket.h"
-#include "rtc_base/proxy_info.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socket_address.h"
-#include "rtc_base/socket_factory.h"
 
 namespace rtc {
 
@@ -47,8 +39,7 @@
       const std::string& user_agent,
       const PacketSocketTcpOptions& tcp_options) override;
 
-  std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
-      override;
+  AsyncResolverInterface* CreateAsyncResolver() override;
 
  private:
   int BindSocket(Socket* socket,

p2p/base/port_unittest.cc

diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index 52153d8..a610eb5 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -1002,10 +1002,7 @@
   void set_next_client_tcp_socket(AsyncPacketSocket* next_client_tcp_socket) {
     next_client_tcp_socket_ = next_client_tcp_socket;
   }
-  std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
-      override {
-    return nullptr;
-  }
+  rtc::AsyncResolverInterface* CreateAsyncResolver() override { return NULL; }
 
  private:
   AsyncPacketSocket* next_udp_socket_;

test/network/emulated_turn_server.cc

diff --git a/test/network/emulated_turn_server.cc b/test/network/emulated_turn_server.cc
index 07118bc..4cd2b51 100644
--- a/test/network/emulated_turn_server.cc
+++ b/test/network/emulated_turn_server.cc
@@ -101,8 +101,7 @@
       const rtc::PacketSocketTcpOptions& tcp_options) override {
     return nullptr;
   }
-  std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
-      override {
+  rtc::AsyncResolverInterface* CreateAsyncResolver() override {
     return nullptr;
   }