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

webrtc/base/nat_unittest.cc

Index: webrtc/base/nat_unittest.cc
diff --git a/webrtc/base/nat_unittest.cc b/webrtc/base/nat_unittest.cc
index f585effdd95337e7313d2e96229f4d84e8d3b1a7..67a1bde38811cb9645a538193d93a32be95194a4 100644
--- a/webrtc/base/nat_unittest.cc
+++ b/webrtc/base/nat_unittest.cc
@@ -12,6 +12,7 @@
 #include <memory>
 #include <string>
 
+#include "webrtc/base/asynctcpsocket.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/natserver.h"
@@ -19,8 +20,8 @@
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/ptr_util.h"
 #include "webrtc/base/testclient.h"
-#include "webrtc/base/asynctcpsocket.h"
 #include "webrtc/base/virtualsocketserver.h"
 
 using namespace rtc;
@@ -34,13 +35,12 @@ bool CheckReceive(
 
 TestClient* CreateTestClient(
       SocketFactory* factory, const SocketAddress& local_addr) {
-  AsyncUDPSocket* socket = AsyncUDPSocket::Create(factory, local_addr);
-  return new TestClient(socket);
+  return new TestClient(
+      WrapUnique(AsyncUDPSocket::Create(factory, local_addr)));
 }
 
 TestClient* CreateTCPTestClient(AsyncSocket* socket) {
-  AsyncTCPSocket* packet_socket = new AsyncTCPSocket(socket, false);
-  return new TestClient(packet_socket);
+  return new TestClient(WrapUnique(new AsyncTCPSocket(socket, false)));

[kwiberg-webrtc, 2017/05/05 11:04:42]

Use MakeUnique instead?

[nisse-webrtc, 2017/05/05 12:12:56]

Done. (This file should also have many raw pointers replaced by unique_ptr, but
that's for a different cl).

[kwiberg-webrtc, 2017/05/05 12:40:31]

Yes, I quickly realized that if I were to complain about every questionable
thing on the lines that you touch, we'd be here all day. :-)

 }
 
 // Tests that when sending from internal_addr to external_addrs through the