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

webrtc/p2p/base/stunserver_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <memory>
 #include <string>
 
-#include "webrtc/p2p/base/stunserver.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/ptr_util.h"
 #include "webrtc/base/testclient.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/p2p/base/stunserver.h"
 
 using namespace cricket;
 
 static const rtc::SocketAddress server_addr("99.99.99.1", 3478);
 static const rtc::SocketAddress client_addr("1.2.3.4", 1234);
 
 class StunServerTest : public testing::Test {
  public:
   StunServerTest()
     : pss_(new rtc::PhysicalSocketServer),
       ss_(new rtc::VirtualSocketServer(pss_.get())),
       network_(ss_.get()) {
   }
   virtual void SetUp() {
     server_.reset(new StunServer(
         rtc::AsyncUDPSocket::Create(ss_.get(), server_addr)));
     client_.reset(new rtc::TestClient(
-        rtc::AsyncUDPSocket::Create(ss_.get(), client_addr)));
+        WrapUnique(rtc::AsyncUDPSocket::Create(ss_.get(), client_addr))));
 
     network_.Start();
   }
   void Send(const StunMessage& msg) {
     rtc::ByteBufferWriter buf;
     msg.Write(&buf);
     Send(buf.Data(), static_cast<int>(buf.Length()));
   }
   void Send(const char* buf, int len) {
     client_->SendTo(buf, len, server_addr);
   }
   bool ReceiveFails() {
     return(client_->CheckNoPacket());
   }
   StunMessage* Receive() {
     StunMessage* msg = NULL;
-    rtc::TestClient::Packet* packet =
+    std::unique_ptr<rtc::TestClient::Packet> packet =
         client_->NextPacket(rtc::TestClient::kTimeoutMs);
     if (packet) {
       rtc::ByteBufferReader buf(packet->buf, packet->size);
       msg = new StunMessage();
       msg->Read(&buf);
-      delete packet;
     }
     return msg;
   }
  private:
   std::unique_ptr<rtc::PhysicalSocketServer> pss_;
   std::unique_ptr<rtc::VirtualSocketServer> ss_;
   rtc::Thread network_;
   std::unique_ptr<StunServer> server_;
   std::unique_ptr<rtc::TestClient> client_;
 };
@@ skipping 32 matching lines @@
 #endif // if !defined(THREAD_SANITIZER)
 
 TEST_F(StunServerTest, TestBad) {
   const char* bad = "this is a completely nonsensical message whose only "
                     "purpose is to make the parser go 'ack'.  it doesn't "
                     "look anything like a normal stun message";
   Send(bad, static_cast<int>(strlen(bad)));
 
   ASSERT_TRUE(ReceiveFails());
 }