Index: webrtc/p2p/base/relayport_unittest.cc |
diff --git a/webrtc/p2p/base/relayport_unittest.cc b/webrtc/p2p/base/relayport_unittest.cc |
index d644d67c4f3d248cd9def2650a24ee9b691a224d..738ea9abb212a7ff586d7c22da26e62c6e63d40d 100644 |
--- a/webrtc/p2p/base/relayport_unittest.cc |
+++ b/webrtc/p2p/base/relayport_unittest.cc |
@@ -8,6 +8,8 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
+#include <memory> |
+ |
#include "webrtc/p2p/base/basicpacketsocketfactory.h" |
#include "webrtc/p2p/base/relayport.h" |
#include "webrtc/p2p/base/relayserver.h" |
@@ -15,7 +17,6 @@ |
#include "webrtc/base/helpers.h" |
#include "webrtc/base/logging.h" |
#include "webrtc/base/physicalsocketserver.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/base/socketadapters.h" |
#include "webrtc/base/socketaddress.h" |
#include "webrtc/base/ssladapter.h" |
@@ -179,7 +180,7 @@ class RelayPortTest : public testing::Test, |
// Create a tcp server socket that listens on the fake address so |
// the relay port can attempt to connect to it. |
- rtc::scoped_ptr<rtc::AsyncSocket> tcp_server_socket( |
+ std::unique_ptr<rtc::AsyncSocket> tcp_server_socket( |
CreateServerSocket(kRelayTcpAddr)); |
// Add server addresses to the relay port and let it start. |
@@ -244,16 +245,15 @@ class RelayPortTest : public testing::Test, |
typedef std::map<rtc::AsyncPacketSocket*, int> PacketMap; |
rtc::Thread* main_; |
- rtc::scoped_ptr<rtc::PhysicalSocketServer> |
- physical_socket_server_; |
- rtc::scoped_ptr<rtc::VirtualSocketServer> virtual_socket_server_; |
+ std::unique_ptr<rtc::PhysicalSocketServer> physical_socket_server_; |
+ std::unique_ptr<rtc::VirtualSocketServer> virtual_socket_server_; |
rtc::SocketServerScope ss_scope_; |
rtc::Network network_; |
rtc::BasicPacketSocketFactory socket_factory_; |
std::string username_; |
std::string password_; |
- rtc::scoped_ptr<cricket::RelayPort> relay_port_; |
- rtc::scoped_ptr<cricket::RelayServer> relay_server_; |
+ std::unique_ptr<cricket::RelayPort> relay_port_; |
+ std::unique_ptr<cricket::RelayServer> relay_server_; |
std::vector<cricket::ProtocolAddress> failed_connections_; |
std::vector<cricket::ProtocolAddress> soft_timedout_connections_; |
PacketMap received_packet_count_; |