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

Side by Side Diff: webrtc/p2p/base/relayport_unittest.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 // Should be the SSLTCP address. 205 // Should be the SSLTCP address.
206 EXPECT_TRUE(relay_server_->HasConnection(kRelaySslAddr)); 206 EXPECT_TRUE(relay_server_->HasConnection(kRelaySslAddr));
207 } 207 }
208 208
209 private: 209 private:
210 rtc::AsyncUDPSocket* CreateAsyncUdpSocket(const SocketAddress addr) { 210 rtc::AsyncUDPSocket* CreateAsyncUdpSocket(const SocketAddress addr) {
211 rtc::AsyncSocket* socket = 211 rtc::AsyncSocket* socket =
212 virtual_socket_server_->CreateAsyncSocket(SOCK_DGRAM); 212 virtual_socket_server_->CreateAsyncSocket(SOCK_DGRAM);
213 rtc::AsyncUDPSocket* packet_socket = 213 rtc::AsyncUDPSocket* packet_socket =
214 rtc::AsyncUDPSocket::Create(socket, addr); 214 rtc::AsyncUDPSocket::Create(socket, addr);
215 EXPECT_TRUE(packet_socket != NULL); 215 EXPECT_TRUE(packet_socket != nullptr);
216 packet_socket->SignalReadPacket.connect(this, &RelayPortTest::OnReadPacket); 216 packet_socket->SignalReadPacket.connect(this, &RelayPortTest::OnReadPacket);
217 return packet_socket; 217 return packet_socket;
218 } 218 }
219 219
220 rtc::AsyncSocket* CreateServerSocket(const SocketAddress addr) { 220 rtc::AsyncSocket* CreateServerSocket(const SocketAddress addr) {
221 rtc::AsyncSocket* socket = 221 rtc::AsyncSocket* socket =
222 virtual_socket_server_->CreateAsyncSocket(SOCK_STREAM); 222 virtual_socket_server_->CreateAsyncSocket(SOCK_STREAM);
223 EXPECT_GE(socket->Bind(addr), 0); 223 EXPECT_GE(socket->Bind(addr), 0);
224 EXPECT_GE(socket->Listen(5), 0); 224 EXPECT_GE(socket->Listen(5), 0);
225 return socket; 225 return socket;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 TestConnectUdp(); 266 TestConnectUdp();
267 } 267 }
268 268
269 TEST_F(RelayPortTest, ConnectTcp) { 269 TEST_F(RelayPortTest, ConnectTcp) {
270 TestConnectTcp(); 270 TestConnectTcp();
271 } 271 }
272 272
273 TEST_F(RelayPortTest, ConnectSslTcp) { 273 TEST_F(RelayPortTest, ConnectSslTcp) {
274 TestConnectSslTcp(); 274 TestConnectSslTcp();
275 } 275 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698