commit 32f25051853fcf483f0a6f145c278eabcc112fc7
author nisse <nisse@webrtc.org> Mon May 08 01:57:18 2017 -0700
committer Commit bot <commit-bot@chromium.org> Mon May 08 08:57:18 2017 +0000
tree d6bdd6e43ace889c51abd8e01ebd2eaa3535d8b7
parent e8f12406b91741cbcffd40cdf031667c21bad9b7

Refactor TestClient to use std::unique_ptr, and fix VirtualSocketServerTest leaks.

BUG=None

Review-Url: https://codereview.webrtc.org/2859373003
Cr-Commit-Position: refs/heads/master@{#18043}

webrtc/base/testclient_unittest.cc

diff --git a/webrtc/base/testclient_unittest.cc b/webrtc/base/testclient_unittest.cc
index 5507813..6854994 100644
--- a/webrtc/base/testclient_unittest.cc
+++ b/webrtc/base/testclient_unittest.cc
@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "webrtc/base/testclient.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/testclient.h"
+#include "webrtc/base/ptr_util.h"
 #include "webrtc/base/testechoserver.h"
 #include "webrtc/base/thread.h"
 
@@ -23,7 +24,7 @@
       ->CreateAsyncSocket(loopback.family(), SOCK_DGRAM);
   socket->Bind(loopback);
 
-  TestClient client(new AsyncUDPSocket(socket));
+  TestClient client(MakeUnique<AsyncUDPSocket>(socket));
   SocketAddress addr = client.address(), from;
   EXPECT_EQ(3, client.SendTo("foo", 3, addr));
   EXPECT_TRUE(client.CheckNextPacket("foo", 3, &from));
@@ -37,11 +38,11 @@
 
   AsyncSocket* socket = main->socketserver()
       ->CreateAsyncSocket(loopback.family(), SOCK_STREAM);
-  AsyncTCPSocket* tcp_socket = AsyncTCPSocket::Create(
-      socket, loopback, server.address());
+  std::unique_ptr<AsyncTCPSocket> tcp_socket =
+      WrapUnique(AsyncTCPSocket::Create(socket, loopback, server.address()));
   ASSERT_TRUE(tcp_socket != nullptr);
 
-  TestClient client(tcp_socket);
+  TestClient client(std::move(tcp_socket));
   SocketAddress addr = client.address(), from;
   EXPECT_TRUE(client.CheckConnected());
   EXPECT_EQ(3, client.Send("foo", 3));