Chromium Code Reviews

Side by Side Diff: webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_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.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 35 matching lines...)
46 }; 46 };
47 47
48 // Creates a socket using the static constructor method and verifies that 48 // Creates a socket using the static constructor method and verifies that
49 // it's added to the socket manager. 49 // it's added to the socket manager.
50 TEST(UdpSocketWrapper, CreateSocket) { 50 TEST(UdpSocketWrapper, CreateSocket) {
51 int32_t id = 42; 51 int32_t id = 42;
52 // We can't test deletion of sockets without a socket manager. 52 // We can't test deletion of sockets without a socket manager.
53 uint8_t threads = 1; 53 uint8_t threads = 1;
54 UdpSocketManager* mgr = UdpSocketManager::Create(id, threads); 54 UdpSocketManager* mgr = UdpSocketManager::Create(id, threads);
55 UdpSocketWrapper* socket = 55 UdpSocketWrapper* socket =
56 UdpSocketWrapper::CreateSocket(id, 56 UdpSocketWrapper::CreateSocket(id, mgr,
57 mgr, 57 nullptr, // CallbackObj
58 NULL, // CallbackObj 58 nullptr, // IncomingSocketCallback
59 NULL, // IncomingSocketCallback 59 false, // ipV6Enable
60 false, // ipV6Enable 60 false); // disableGQOS
61 false); // disableGQOS
62 socket->CloseBlocking(); 61 socket->CloseBlocking();
63 UdpSocketManager::Return(); 62 UdpSocketManager::Return();
64 } 63 }
65 64
66 } // namespace test 65 } // namespace test
67 } // namespace webrtc 66 } // namespace webrtc
OLDNEW

Powered by Google App Engine