From 404cd60ecce1879ce1c9c593ca0d0cb9784e0589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Wed, 6 Oct 2021 09:47:55 +0200
Subject: [PATCH] Fix weird socket member naming in AsyncStunTCPSocketTest

Bug: webrtc:13065
Change-Id: Ifd7af4b283d55cbe0e3a03185b1b8e0bab6d47cc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234322
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35151}
---
 p2p/base/async_stun_tcp_socket_unittest.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/p2p/base/async_stun_tcp_socket_unittest.cc b/p2p/base/async_stun_tcp_socket_unittest.cc
index 64c9a3488b..571db83943 100644
--- a/p2p/base/async_stun_tcp_socket_unittest.cc
+++ b/p2p/base/async_stun_tcp_socket_unittest.cc
@@ -17,6 +17,7 @@
 #include <memory>
 #include <string>
 
+#include "absl/memory/memory.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/socket.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
@@ -78,13 +79,13 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
   void CreateSockets() {
     rtc::Socket* server = vss_->CreateSocket(kServerAddr.family(), SOCK_STREAM);
     server->Bind(kServerAddr);
-    recv_socket_.reset(new AsyncStunServerTCPSocket(server));
-    recv_socket_->SignalNewConnection.connect(
+    listen_socket_ = std::make_unique<AsyncStunServerTCPSocket>(server);
+    listen_socket_->SignalNewConnection.connect(
         this, &AsyncStunTCPSocketTest::OnNewConnection);
 
     rtc::Socket* client = vss_->CreateSocket(kClientAddr.family(), SOCK_STREAM);
     send_socket_.reset(AsyncStunTCPSocket::Create(
-        client, kClientAddr, recv_socket_->GetLocalAddress()));
+        client, kClientAddr, listen_socket_->GetLocalAddress()));
     send_socket_->SignalSentPacket.connect(
         this, &AsyncStunTCPSocketTest::OnSentPacket);
     ASSERT_TRUE(send_socket_.get() != NULL);
@@ -106,7 +107,7 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
 
   void OnNewConnection(rtc::AsyncPacketSocket* /*server*/,
                        rtc::AsyncPacketSocket* new_socket) {
-    listen_socket_.reset(new_socket);
+    recv_socket_ = absl::WrapUnique(new_socket);
     new_socket->SignalReadPacket.connect(this,
                                          &AsyncStunTCPSocketTest::OnReadPacket);
   }
@@ -132,8 +133,8 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
   std::unique_ptr<rtc::VirtualSocketServer> vss_;
   rtc::AutoSocketServerThread thread_;
   std::unique_ptr<AsyncStunTCPSocket> send_socket_;
-  std::unique_ptr<rtc::AsyncPacketSocket> recv_socket_;
   std::unique_ptr<rtc::AsyncPacketSocket> listen_socket_;
+  std::unique_ptr<rtc::AsyncPacketSocket> recv_socket_;
   std::list<std::string> recv_packets_;
   int sent_packets_ = 0;
 };