| Index: webrtc/p2p/base/pseudotcp_unittest.cc
|
| diff --git a/webrtc/p2p/base/pseudotcp_unittest.cc b/webrtc/p2p/base/pseudotcp_unittest.cc
|
| index 8fb5b38b4d9bab77b233b62e9bf3d018c2bd57e1..11d3dc1c7859df431fde01c65daae729b07bc272 100644
|
| --- a/webrtc/p2p/base/pseudotcp_unittest.cc
|
| +++ b/webrtc/p2p/base/pseudotcp_unittest.cc
|
| @@ -215,7 +215,7 @@ class PseudoTcpTest : public PseudoTcpTestBase {
|
| send_stream_.ReserveSize(size);
|
| for (int i = 0; i < size; ++i) {
|
| char ch = static_cast<char>(i);
|
| - send_stream_.Write(&ch, 1, NULL, NULL);
|
| + send_stream_.Write(&ch, 1, nullptr, nullptr);
|
| }
|
| send_stream_.Rewind();
|
| // Prepare the receive stream.
|
| @@ -278,7 +278,7 @@ class PseudoTcpTest : public PseudoTcpTestBase {
|
| do {
|
| rcvd = remote_.Recv(block, sizeof(block));
|
| if (rcvd != -1) {
|
| - recv_stream_.Write(block, rcvd, NULL, NULL);
|
| + recv_stream_.Write(block, rcvd, nullptr, nullptr);
|
| recv_stream_.GetPosition(&position);
|
| LOG(LS_VERBOSE) << "Received: " << position;
|
| }
|
| @@ -290,7 +290,7 @@ class PseudoTcpTest : public PseudoTcpTestBase {
|
| char block[kBlockSize];
|
| do {
|
| send_stream_.GetPosition(&position);
|
| - if (send_stream_.Read(block, sizeof(block), &tosend, NULL) !=
|
| + if (send_stream_.Read(block, sizeof(block), &tosend, nullptr) !=
|
| rtc::SR_EOS) {
|
| sent = local_.Send(block, tosend);
|
| UpdateLocalClock();
|
| @@ -318,10 +318,9 @@ class PseudoTcpTestPingPong : public PseudoTcpTestBase {
|
| public:
|
| PseudoTcpTestPingPong()
|
| : iterations_remaining_(0),
|
| - sender_(NULL),
|
| - receiver_(NULL),
|
| - bytes_per_send_(0) {
|
| - }
|
| + sender_(nullptr),
|
| + receiver_(nullptr),
|
| + bytes_per_send_(0) {}
|
| void SetBytesPerSend(int bytes) {
|
| bytes_per_send_ = bytes;
|
| }
|
| @@ -334,7 +333,7 @@ class PseudoTcpTestPingPong : public PseudoTcpTestBase {
|
| send_stream_.ReserveSize(size);
|
| for (int i = 0; i < size; ++i) {
|
| char ch = static_cast<char>(i);
|
| - send_stream_.Write(&ch, 1, NULL, NULL);
|
| + send_stream_.Write(&ch, 1, nullptr, nullptr);
|
| }
|
| send_stream_.Rewind();
|
| // Prepare the receive stream.
|
| @@ -397,7 +396,7 @@ class PseudoTcpTestPingPong : public PseudoTcpTestBase {
|
| do {
|
| rcvd = receiver_->Recv(block, sizeof(block));
|
| if (rcvd != -1) {
|
| - recv_stream_.Write(block, rcvd, NULL, NULL);
|
| + recv_stream_.Write(block, rcvd, nullptr, nullptr);
|
| recv_stream_.GetPosition(&position);
|
| LOG(LS_VERBOSE) << "Received: " << position;
|
| }
|
| @@ -410,8 +409,7 @@ class PseudoTcpTestPingPong : public PseudoTcpTestBase {
|
| do {
|
| send_stream_.GetPosition(&position);
|
| tosend = bytes_per_send_ ? bytes_per_send_ : sizeof(block);
|
| - if (send_stream_.Read(block, tosend, &tosend, NULL) !=
|
| - rtc::SR_EOS) {
|
| + if (send_stream_.Read(block, tosend, &tosend, nullptr) != rtc::SR_EOS) {
|
| sent = sender_->Send(block, tosend);
|
| UpdateLocalClock();
|
| if (sent != -1) {
|
| @@ -446,7 +444,7 @@ class PseudoTcpTestReceiveWindow : public PseudoTcpTestBase {
|
| send_stream_.ReserveSize(size);
|
| for (int i = 0; i < size; ++i) {
|
| char ch = static_cast<char>(i);
|
| - send_stream_.Write(&ch, 1, NULL, NULL);
|
| + send_stream_.Write(&ch, 1, nullptr, nullptr);
|
| }
|
| send_stream_.Rewind();
|
|
|
| @@ -513,7 +511,7 @@ class PseudoTcpTestReceiveWindow : public PseudoTcpTestBase {
|
| do {
|
| rcvd = remote_.Recv(block, sizeof(block));
|
| if (rcvd != -1) {
|
| - recv_stream_.Write(block, rcvd, NULL, NULL);
|
| + recv_stream_.Write(block, rcvd, nullptr, nullptr);
|
| recv_stream_.GetPosition(&position);
|
| LOG(LS_VERBOSE) << "Received: " << position;
|
| }
|
| @@ -537,7 +535,7 @@ class PseudoTcpTestReceiveWindow : public PseudoTcpTestBase {
|
| char block[kBlockSize];
|
| do {
|
| send_stream_.GetPosition(&position);
|
| - if (send_stream_.Read(block, sizeof(block), &tosend, NULL) !=
|
| + if (send_stream_.Read(block, sizeof(block), &tosend, nullptr) !=
|
| rtc::SR_EOS) {
|
| sent = local_.Send(block, tosend);
|
| UpdateLocalClock();
|
|
|