| Index: webrtc/base/proxy_unittest.cc
|
| diff --git a/webrtc/base/proxy_unittest.cc b/webrtc/base/proxy_unittest.cc
|
| index 4dba0dd8f34be4c62c843e53d3963e7008741fed..0c1ebfdbcf657f0d18d0730762e14a94902df0af 100644
|
| --- a/webrtc/base/proxy_unittest.cc
|
| +++ b/webrtc/base/proxy_unittest.cc
|
| @@ -44,16 +44,14 @@ class AutoDetectProxyRunner : public rtc::AutoDetectProxy {
|
| // Sets up a virtual socket server and HTTPS/SOCKS5 proxy servers.
|
| class ProxyTest : public testing::Test {
|
| public:
|
| - ProxyTest() : ss_(new rtc::VirtualSocketServer(NULL)) {
|
| + ProxyTest() : ss_(new rtc::VirtualSocketServer(nullptr)) {
|
| Thread::Current()->set_socketserver(ss_.get());
|
| socks_.reset(new rtc::SocksProxyServer(
|
| ss_.get(), kSocksProxyIntAddr, ss_.get(), kSocksProxyExtAddr));
|
| https_.reset(new rtc::HttpListenServer());
|
| https_->Listen(kHttpsProxyIntAddr);
|
| }
|
| - ~ProxyTest() {
|
| - Thread::Current()->set_socketserver(NULL);
|
| - }
|
| + ~ProxyTest() { Thread::Current()->set_socketserver(nullptr); }
|
|
|
| rtc::SocketServer* ss() { return ss_.get(); }
|
|
|
| @@ -88,7 +86,7 @@ TEST_F(ProxyTest, TestSocks5Connect) {
|
|
|
| rtc::AsyncTCPSocket* packet_socket = rtc::AsyncTCPSocket::Create(
|
| proxy_socket, SocketAddress(INADDR_ANY, 0), server.address());
|
| - EXPECT_TRUE(packet_socket != NULL);
|
| + EXPECT_TRUE(packet_socket != nullptr);
|
| rtc::TestClient client(packet_socket);
|
|
|
| EXPECT_EQ(Socket::CS_CONNECTING, proxy_socket->GetState());
|
| @@ -96,7 +94,7 @@ TEST_F(ProxyTest, TestSocks5Connect) {
|
| EXPECT_EQ(Socket::CS_CONNECTED, proxy_socket->GetState());
|
| EXPECT_EQ(server.address(), client.remote_address());
|
| client.Send("foo", 3);
|
| - EXPECT_TRUE(client.CheckNextPacket("foo", 3, NULL));
|
| + EXPECT_TRUE(client.CheckNextPacket("foo", 3, nullptr));
|
| EXPECT_TRUE(client.CheckNoPacket());
|
| }
|
|
|
| @@ -113,7 +111,7 @@ TEST_F(ProxyTest, TestHttpsConnect) {
|
| EXPECT_TRUE(client.CheckConnected());
|
| EXPECT_EQ(server.address(), client.remote_address());
|
| client.Send("foo", 3);
|
| - EXPECT_TRUE(client.CheckNextPacket("foo", 3, NULL));
|
| + EXPECT_TRUE(client.CheckNextPacket("foo", 3, nullptr));
|
| EXPECT_TRUE(client.CheckNoPacket());
|
| }
|
| */
|
|
|