Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: webrtc/p2p/base/tcpport_unittest.cc

Issue 1966423002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove new scoped_ptr uses Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/base/stunserver.h ('k') | webrtc/p2p/base/testrelayserver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/tcpport_unittest.cc
diff --git a/webrtc/p2p/base/tcpport_unittest.cc b/webrtc/p2p/base/tcpport_unittest.cc
index 77fb790c537bda82c6ec55171851c966f050c807..e33dd433a7dd8e09e61ebc5bab214e3672e30b2c 100644
--- a/webrtc/p2p/base/tcpport_unittest.cc
+++ b/webrtc/p2p/base/tcpport_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
+
#include "webrtc/base/gunit.h"
#include "webrtc/base/physicalsocketserver.h"
#include "webrtc/base/thread.h"
@@ -63,8 +65,8 @@ class TCPPortTest : public testing::Test, public sigslot::has_slots<> {
protected:
rtc::Thread* main_;
- rtc::scoped_ptr<rtc::PhysicalSocketServer> pss_;
- rtc::scoped_ptr<rtc::VirtualSocketServer> ss_;
+ std::unique_ptr<rtc::PhysicalSocketServer> pss_;
+ std::unique_ptr<rtc::VirtualSocketServer> ss_;
rtc::SocketServerScope ss_scope_;
rtc::Network network_;
rtc::BasicPacketSocketFactory socket_factory_;
@@ -73,8 +75,8 @@ class TCPPortTest : public testing::Test, public sigslot::has_slots<> {
};
TEST_F(TCPPortTest, TestTCPPortWithLocalhostAddress) {
- rtc::scoped_ptr<TCPPort> lport(CreateTCPPort(kLocalAddr));
- rtc::scoped_ptr<TCPPort> rport(CreateTCPPort(kRemoteAddr));
+ std::unique_ptr<TCPPort> lport(CreateTCPPort(kLocalAddr));
+ std::unique_ptr<TCPPort> rport(CreateTCPPort(kRemoteAddr));
lport->PrepareAddress();
rport->PrepareAddress();
// Start to listen to new socket creation event.
« no previous file with comments | « webrtc/p2p/base/stunserver.h ('k') | webrtc/p2p/base/testrelayserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698