Index: webrtc/p2p/base/relayport_unittest.cc |
diff --git a/webrtc/p2p/base/relayport_unittest.cc b/webrtc/p2p/base/relayport_unittest.cc |
index 0d699532cfbd27d74b1b75eb9c4290c717dce161..6b91baf2344db4777b6c5ce9bbe6d2130e80edca 100644 |
--- a/webrtc/p2p/base/relayport_unittest.cc |
+++ b/webrtc/p2p/base/relayport_unittest.cc |
@@ -16,7 +16,6 @@ |
#include "webrtc/base/gunit.h" |
#include "webrtc/base/helpers.h" |
#include "webrtc/base/logging.h" |
-#include "webrtc/base/physicalsocketserver.h" |
#include "webrtc/base/socketadapters.h" |
#include "webrtc/base/socketaddress.h" |
#include "webrtc/base/ssladapter.h" |
@@ -45,20 +44,21 @@ class RelayPortTest : public testing::Test, |
public sigslot::has_slots<> { |
public: |
RelayPortTest() |
- : physical_socket_server_(new rtc::PhysicalSocketServer), |
- virtual_socket_server_(new rtc::VirtualSocketServer( |
- physical_socket_server_.get())), |
+ : virtual_socket_server_(new rtc::VirtualSocketServer()), |
main_(virtual_socket_server_.get()), |
network_("unittest", "unittest", rtc::IPAddress(INADDR_ANY), 32), |
socket_factory_(rtc::Thread::Current()), |
username_(rtc::CreateRandomString(16)), |
password_(rtc::CreateRandomString(16)), |
- relay_port_(cricket::RelayPort::Create(&main_, &socket_factory_, |
+ relay_port_(cricket::RelayPort::Create(&main_, |
+ &socket_factory_, |
&network_, |
kLocalAddress.ipaddr(), |
- 0, 0, username_, password_)), |
- relay_server_(new cricket::RelayServer(&main_)) { |
- } |
+ 0, |
+ 0, |
+ username_, |
+ password_)), |
+ relay_server_(new cricket::RelayServer(&main_)) {} |
void OnReadPacket(rtc::AsyncPacketSocket* socket, |
const char* data, size_t size, |
@@ -246,7 +246,6 @@ class RelayPortTest : public testing::Test, |
typedef std::map<rtc::AsyncPacketSocket*, int> PacketMap; |
- std::unique_ptr<rtc::PhysicalSocketServer> physical_socket_server_; |
std::unique_ptr<rtc::VirtualSocketServer> virtual_socket_server_; |
rtc::AutoSocketServerThread main_; |
rtc::Network network_; |