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

Side by Side Diff: webrtc/pc/quicdatachannel_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 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 ASSERT_FALSE(peer1_.quic_transport_channel()->writable()); 596 ASSERT_FALSE(peer1_.quic_transport_channel()->writable());
597 EXPECT_EQ(webrtc::DataChannelInterface::kOpen, data_channel->state()); 597 EXPECT_EQ(webrtc::DataChannelInterface::kOpen, data_channel->state());
598 EXPECT_EQ(0, observer.on_state_change_count()); 598 EXPECT_EQ(0, observer.on_state_change_count());
599 // unwritable => writable 599 // unwritable => writable
600 peer1_.ice_transport_channel()->SetWritable(true); 600 peer1_.ice_transport_channel()->SetWritable(true);
601 ASSERT_TRUE(peer1_.quic_transport_channel()->writable()); 601 ASSERT_TRUE(peer1_.quic_transport_channel()->writable());
602 EXPECT_EQ(webrtc::DataChannelInterface::kOpen, data_channel->state()); 602 EXPECT_EQ(webrtc::DataChannelInterface::kOpen, data_channel->state());
603 EXPECT_EQ(0, observer.on_state_change_count()); 603 EXPECT_EQ(0, observer.on_state_change_count());
604 } 604 }
605 605
606 // Tests that SetTransportChannel returns false when setting a NULL transport 606 // Tests that SetTransportChannel returns false when setting a null transport
607 // channel or a transport channel that is not equivalent to the one already set. 607 // channel or a transport channel that is not equivalent to the one already set.
608 TEST_F(QuicDataChannelTest, SetTransportChannelReturnValue) { 608 TEST_F(QuicDataChannelTest, SetTransportChannelReturnValue) {
609 rtc::scoped_refptr<QuicDataChannel> data_channel = 609 rtc::scoped_refptr<QuicDataChannel> data_channel =
610 peer1_.CreateDataChannelWithTransportChannel(4, "label", "protocol"); 610 peer1_.CreateDataChannelWithTransportChannel(4, "label", "protocol");
611 EXPECT_FALSE(data_channel->SetTransportChannel(nullptr)); 611 EXPECT_FALSE(data_channel->SetTransportChannel(nullptr));
612 QuicTransportChannel* transport_channel = peer1_.quic_transport_channel(); 612 QuicTransportChannel* transport_channel = peer1_.quic_transport_channel();
613 EXPECT_TRUE(data_channel->SetTransportChannel(transport_channel)); 613 EXPECT_TRUE(data_channel->SetTransportChannel(transport_channel));
614 EXPECT_TRUE(data_channel->SetTransportChannel(transport_channel)); 614 EXPECT_TRUE(data_channel->SetTransportChannel(transport_channel));
615 QuicTransportChannel* other_transport_channel = 615 QuicTransportChannel* other_transport_channel =
616 peer2_.quic_transport_channel(); 616 peer2_.quic_transport_channel();
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 size_t bytes_read2; 649 size_t bytes_read2;
650 ASSERT_TRUE(webrtc::ParseQuicDataMessageHeader( 650 ASSERT_TRUE(webrtc::ParseQuicDataMessageHeader(
651 header2.data<char>(), header2.size(), &decoded_data_channel_id2, 651 header2.data<char>(), header2.size(), &decoded_data_channel_id2,
652 &decoded_message_id2, &bytes_read2)); 652 &decoded_message_id2, &bytes_read2));
653 EXPECT_EQ(data_channel_id2, decoded_data_channel_id2); 653 EXPECT_EQ(data_channel_id2, decoded_data_channel_id2);
654 EXPECT_EQ(message_id2, decoded_message_id2); 654 EXPECT_EQ(message_id2, decoded_message_id2);
655 EXPECT_EQ(8u, bytes_read2); 655 EXPECT_EQ(8u, bytes_read2);
656 } 656 }
657 657
658 } // namespace 658 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698