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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/pc/peerconnectioninterface_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 side-by-side diff with in-line comments
Download patch
« webrtc/base/event.cc ('K') | « webrtc/pc/peerconnectionfactory_unittest.cc ('k') | webrtc/pc/quicdatachannel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnectioninterface_unittest.cc
diff --git a/webrtc/pc/peerconnectioninterface_unittest.cc b/webrtc/pc/peerconnectioninterface_unittest.cc
index 84bfa3abf51b5ce78e43b07ab96db239114d2a75..f69d0b5722904b5f807ee026628246f9674eb411 100644
--- a/webrtc/pc/peerconnectioninterface_unittest.cc
+++ b/webrtc/pc/peerconnectioninterface_unittest.cc
@@ -585,9 +585,9 @@ class MockPeerConnectionObserver : public PeerConnectionObserver {
std::string sdp;
EXPECT_TRUE(candidate->ToString(&sdp));
EXPECT_LT(0u, sdp.size());
- last_candidate_.reset(webrtc::CreateIceCandidate(candidate->sdp_mid(),
- candidate->sdp_mline_index(), sdp, NULL));
- EXPECT_TRUE(last_candidate_.get() != NULL);
+ last_candidate_.reset(webrtc::CreateIceCandidate(
+ candidate->sdp_mid(), candidate->sdp_mline_index(), sdp, nullptr));
+ EXPECT_TRUE(last_candidate_.get() != nullptr);
callback_triggered_ = true;
}
@@ -751,7 +751,7 @@ class PeerConnectionInterfaceTest : public testing::Test {
pc_ = pc_factory_->CreatePeerConnection(
config, constraints, std::move(port_allocator),
std::move(cert_generator), &observer_);
- ASSERT_TRUE(pc_.get() != NULL);
+ ASSERT_TRUE(pc_.get() != nullptr);
observer_.SetPeerConnectionInterface(pc_.get());
EXPECT_EQ(PeerConnectionInterface::kStable, observer_.state_);
}
@@ -792,8 +792,8 @@ class PeerConnectionInterfaceTest : public testing::Test {
}
void ReleasePeerConnection() {
- pc_ = NULL;
- observer_.SetPeerConnectionInterface(NULL);
+ pc_ = nullptr;
+ observer_.SetPeerConnectionInterface(nullptr);
}
void AddVideoStream(const std::string& label) {
@@ -801,7 +801,8 @@ class PeerConnectionInterfaceTest : public testing::Test {
rtc::scoped_refptr<MediaStreamInterface> stream(
pc_factory_->CreateLocalMediaStream(label));
rtc::scoped_refptr<VideoTrackSourceInterface> video_source(
- pc_factory_->CreateVideoSource(new cricket::FakeVideoCapturer(), NULL));
+ pc_factory_->CreateVideoSource(new cricket::FakeVideoCapturer(),
+ nullptr));
rtc::scoped_refptr<VideoTrackInterface> video_track(
pc_factory_->CreateVideoTrack(label + "v0", video_source));
stream->AddTrack(video_track.get());
@@ -815,7 +816,7 @@ class PeerConnectionInterfaceTest : public testing::Test {
rtc::scoped_refptr<MediaStreamInterface> stream(
pc_factory_->CreateLocalMediaStream(label));
rtc::scoped_refptr<AudioTrackInterface> audio_track(
- pc_factory_->CreateAudioTrack(label + "a0", NULL));
+ pc_factory_->CreateAudioTrack(label + "a0", nullptr));
stream->AddTrack(audio_track.get());
EXPECT_TRUE(pc_->AddStream(stream));
EXPECT_TRUE_WAIT(observer_.renegotiation_needed_, kTimeout);
@@ -830,7 +831,7 @@ class PeerConnectionInterfaceTest : public testing::Test {
pc_factory_->CreateLocalMediaStream(stream_label));
rtc::scoped_refptr<AudioTrackInterface> audio_track(
pc_factory_->CreateAudioTrack(
- audio_track_label, static_cast<AudioSourceInterface*>(NULL)));
+ audio_track_label, static_cast<AudioSourceInterface*>(nullptr)));
stream->AddTrack(audio_track.get());
rtc::scoped_refptr<VideoTrackInterface> video_track(
pc_factory_->CreateVideoTrack(
@@ -916,12 +917,12 @@ class PeerConnectionInterfaceTest : public testing::Test {
const cricket::MediaContentDescription* desc =
cricket::GetFirstAudioContentDescription(
pc_->remote_description()->description());
- ASSERT_TRUE(desc != NULL);
+ ASSERT_TRUE(desc != nullptr);
EXPECT_GT(desc->rtp_header_extensions().size(), 0u);
desc = cricket::GetFirstVideoContentDescription(
pc_->remote_description()->description());
- ASSERT_TRUE(desc != NULL);
+ ASSERT_TRUE(desc != nullptr);
EXPECT_GT(desc->rtp_header_extensions().size(), 0u);
}
@@ -932,7 +933,7 @@ class PeerConnectionInterfaceTest : public testing::Test {
EXPECT_TRUE(offer->ToString(&sdp));
SessionDescriptionInterface* remote_offer =
webrtc::CreateSessionDescription(SessionDescriptionInterface::kOffer,
- sdp, NULL);
+ sdp, nullptr);
EXPECT_TRUE(DoSetRemoteDescription(remote_offer));
EXPECT_EQ(PeerConnectionInterface::kHaveRemoteOffer, observer_.state_);
}
@@ -958,9 +959,8 @@ class PeerConnectionInterfaceTest : public testing::Test {
// https://code.google.com/p/webrtc/issues/detail?id=1356
std::string sdp;
EXPECT_TRUE(answer->ToString(&sdp));
- SessionDescriptionInterface* new_answer =
- webrtc::CreateSessionDescription(SessionDescriptionInterface::kAnswer,
- sdp, NULL);
+ SessionDescriptionInterface* new_answer = webrtc::CreateSessionDescription(
+ SessionDescriptionInterface::kAnswer, sdp, nullptr);
EXPECT_TRUE(DoSetLocalDescription(new_answer));
EXPECT_EQ(PeerConnectionInterface::kStable, observer_.state_);
}
@@ -971,9 +971,8 @@ class PeerConnectionInterfaceTest : public testing::Test {
std::string sdp;
EXPECT_TRUE(answer->ToString(&sdp));
- SessionDescriptionInterface* pr_answer =
- webrtc::CreateSessionDescription(SessionDescriptionInterface::kPrAnswer,
- sdp, NULL);
+ SessionDescriptionInterface* pr_answer = webrtc::CreateSessionDescription(
+ SessionDescriptionInterface::kPrAnswer, sdp, nullptr);
EXPECT_TRUE(DoSetLocalDescription(pr_answer));
EXPECT_EQ(PeerConnectionInterface::kHaveLocalPrAnswer, observer_.state_);
}
@@ -997,10 +996,8 @@ class PeerConnectionInterfaceTest : public testing::Test {
// https://code.google.com/p/webrtc/issues/detail?id=1356
std::string sdp;
EXPECT_TRUE(offer->ToString(&sdp));
- SessionDescriptionInterface* new_offer =
- webrtc::CreateSessionDescription(
- SessionDescriptionInterface::kOffer,
- sdp, NULL);
+ SessionDescriptionInterface* new_offer = webrtc::CreateSessionDescription(
+ SessionDescriptionInterface::kOffer, sdp, nullptr);
EXPECT_TRUE(DoSetLocalDescription(new_offer));
EXPECT_EQ(PeerConnectionInterface::kHaveLocalOffer, observer_.state_);
@@ -1011,7 +1008,7 @@ class PeerConnectionInterfaceTest : public testing::Test {
void CreateAnswerAsRemoteDescription(const std::string& sdp) {
webrtc::JsepSessionDescription* answer = new webrtc::JsepSessionDescription(
SessionDescriptionInterface::kAnswer);
- EXPECT_TRUE(answer->Initialize(sdp, NULL));
+ EXPECT_TRUE(answer->Initialize(sdp, nullptr));
EXPECT_TRUE(DoSetRemoteDescription(answer));
EXPECT_EQ(PeerConnectionInterface::kStable, observer_.state_);
}
@@ -1020,13 +1017,13 @@ class PeerConnectionInterfaceTest : public testing::Test {
webrtc::JsepSessionDescription* pr_answer =
new webrtc::JsepSessionDescription(
SessionDescriptionInterface::kPrAnswer);
- EXPECT_TRUE(pr_answer->Initialize(sdp, NULL));
+ EXPECT_TRUE(pr_answer->Initialize(sdp, nullptr));
EXPECT_TRUE(DoSetRemoteDescription(pr_answer));
EXPECT_EQ(PeerConnectionInterface::kHaveRemotePrAnswer, observer_.state_);
webrtc::JsepSessionDescription* answer =
new webrtc::JsepSessionDescription(
SessionDescriptionInterface::kAnswer);
- EXPECT_TRUE(answer->Initialize(sdp, NULL));
+ EXPECT_TRUE(answer->Initialize(sdp, nullptr));
EXPECT_TRUE(DoSetRemoteDescription(answer));
EXPECT_EQ(PeerConnectionInterface::kStable, observer_.state_);
}
@@ -1298,8 +1295,8 @@ TEST_F(PeerConnectionInterfaceTest, AddStreams) {
rtc::scoped_refptr<MediaStreamInterface> stream(
pc_factory_->CreateLocalMediaStream(kStreamLabel3));
rtc::scoped_refptr<AudioTrackInterface> audio_track(
- pc_factory_->CreateAudioTrack(kStreamLabel3,
- static_cast<AudioSourceInterface*>(NULL)));
+ pc_factory_->CreateAudioTrack(
+ kStreamLabel3, static_cast<AudioSourceInterface*>(nullptr)));
stream->AddTrack(audio_track.get());
EXPECT_TRUE(pc_->AddStream(stream));
EXPECT_EQ(3u, pc_->local_streams()->count());
@@ -1548,7 +1545,7 @@ TEST_F(PeerConnectionInterfaceTest, IceCandidates) {
EXPECT_TRUE(DoCreateAnswer(&answer, nullptr));
EXPECT_TRUE(DoSetLocalDescription(answer.release()));
- EXPECT_TRUE_WAIT(observer_.last_candidate_.get() != NULL, kTimeout);
+ EXPECT_TRUE_WAIT(observer_.last_candidate_.get() != nullptr, kTimeout);
EXPECT_TRUE_WAIT(observer_.ice_complete_, kTimeout);
EXPECT_TRUE(pc_->AddIceCandidate(observer_.last_candidate_.get()));
@@ -1702,7 +1699,7 @@ TEST_F(PeerConnectionInterfaceTest, GetStatsForVideoTrack) {
TEST_F(PeerConnectionInterfaceTest, GetStatsForInvalidTrack) {
InitiateCall();
rtc::scoped_refptr<AudioTrackInterface> unknown_audio_track(
- pc_factory_->CreateAudioTrack("unknown track", NULL));
+ pc_factory_->CreateAudioTrack("unknown track", nullptr));
EXPECT_FALSE(DoGetStats(unknown_audio_track));
}
@@ -1712,10 +1709,10 @@ TEST_F(PeerConnectionInterfaceTest, TestDataChannel) {
constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints);
rtc::scoped_refptr<DataChannelInterface> data1 =
- pc_->CreateDataChannel("test1", NULL);
+ pc_->CreateDataChannel("test1", nullptr);
rtc::scoped_refptr<DataChannelInterface> data2 =
- pc_->CreateDataChannel("test2", NULL);
- ASSERT_TRUE(data1 != NULL);
+ pc_->CreateDataChannel("test2", nullptr);
+ ASSERT_TRUE(data1 != nullptr);
std::unique_ptr<MockDataChannelObserver> observer1(
new MockDataChannelObserver(data1));
std::unique_ptr<MockDataChannelObserver> observer2(
@@ -1759,10 +1756,10 @@ TEST_F(PeerConnectionInterfaceTest, TestSendBinaryOnRtpDataChannel) {
constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints);
rtc::scoped_refptr<DataChannelInterface> data1 =
- pc_->CreateDataChannel("test1", NULL);
+ pc_->CreateDataChannel("test1", nullptr);
rtc::scoped_refptr<DataChannelInterface> data2 =
- pc_->CreateDataChannel("test2", NULL);
- ASSERT_TRUE(data1 != NULL);
+ pc_->CreateDataChannel("test2", nullptr);
+ ASSERT_TRUE(data1 != nullptr);
std::unique_ptr<MockDataChannelObserver> observer1(
new MockDataChannelObserver(data1));
std::unique_ptr<MockDataChannelObserver> observer2(
@@ -1789,7 +1786,7 @@ TEST_F(PeerConnectionInterfaceTest, TestSendOnlyDataChannel) {
constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints);
rtc::scoped_refptr<DataChannelInterface> data1 =
- pc_->CreateDataChannel("test1", NULL);
+ pc_->CreateDataChannel("test1", nullptr);
std::unique_ptr<MockDataChannelObserver> observer1(
new MockDataChannelObserver(data1));
@@ -1813,7 +1810,7 @@ TEST_F(PeerConnectionInterfaceTest, TestReceiveOnlyDataChannel) {
std::string offer_label = "offer_channel";
rtc::scoped_refptr<DataChannelInterface> offer_channel =
- pc_->CreateDataChannel(offer_label, NULL);
+ pc_->CreateDataChannel(offer_label, nullptr);
CreateOfferAsLocalDescription();
@@ -1828,7 +1825,7 @@ TEST_F(PeerConnectionInterfaceTest, TestReceiveOnlyDataChannel) {
// Verify that a new incoming data channel has been created and that
// it is open but can't we written to.
- ASSERT_TRUE(observer_.last_datachannel_ != NULL);
+ ASSERT_TRUE(observer_.last_datachannel_ != nullptr);
DataChannelInterface* received_channel = observer_.last_datachannel_;
EXPECT_EQ(DataChannelInterface::kConnecting, received_channel->state());
EXPECT_EQ(receive_label, received_channel->label());
@@ -1857,7 +1854,7 @@ TEST_F(PeerConnectionInterfaceTest, CreateReliableRtpDataChannelShouldFail) {
config.reliable = true;
rtc::scoped_refptr<DataChannelInterface> channel =
pc_->CreateDataChannel(label, &config);
- EXPECT_TRUE(channel == NULL);
+ EXPECT_TRUE(channel == nullptr);
}
// Verifies that duplicated label is not allowed for RTP data channel.
@@ -1887,28 +1884,28 @@ TEST_F(PeerConnectionInterfaceTest, CreateSctpDataChannel) {
rtc::scoped_refptr<DataChannelInterface> channel =
pc_->CreateDataChannel("1", &config);
- EXPECT_TRUE(channel != NULL);
+ EXPECT_TRUE(channel != nullptr);
EXPECT_TRUE(channel->reliable());
EXPECT_TRUE(observer_.renegotiation_needed_);
observer_.renegotiation_needed_ = false;
config.ordered = false;
channel = pc_->CreateDataChannel("2", &config);
- EXPECT_TRUE(channel != NULL);
+ EXPECT_TRUE(channel != nullptr);
EXPECT_TRUE(channel->reliable());
EXPECT_FALSE(observer_.renegotiation_needed_);
config.ordered = true;
config.maxRetransmits = 0;
channel = pc_->CreateDataChannel("3", &config);
- EXPECT_TRUE(channel != NULL);
+ EXPECT_TRUE(channel != nullptr);
EXPECT_FALSE(channel->reliable());
EXPECT_FALSE(observer_.renegotiation_needed_);
config.maxRetransmits = -1;
config.maxRetransmitTime = 0;
channel = pc_->CreateDataChannel("4", &config);
- EXPECT_TRUE(channel != NULL);
+ EXPECT_TRUE(channel != nullptr);
EXPECT_FALSE(channel->reliable());
EXPECT_FALSE(observer_.renegotiation_needed_);
}
@@ -1928,7 +1925,7 @@ TEST_F(PeerConnectionInterfaceTest,
rtc::scoped_refptr<DataChannelInterface> channel =
pc_->CreateDataChannel(label, &config);
- EXPECT_TRUE(channel == NULL);
+ EXPECT_TRUE(channel == nullptr);
}
// The test verifies that creating a SCTP data channel with an id already in use
@@ -1944,20 +1941,20 @@ TEST_F(PeerConnectionInterfaceTest,
config.id = 1;
channel = pc_->CreateDataChannel("1", &config);
- EXPECT_TRUE(channel != NULL);
+ EXPECT_TRUE(channel != nullptr);
EXPECT_EQ(1, channel->id());
channel = pc_->CreateDataChannel("x", &config);
- EXPECT_TRUE(channel == NULL);
+ EXPECT_TRUE(channel == nullptr);
config.id = cricket::kMaxSctpSid;
channel = pc_->CreateDataChannel("max", &config);
- EXPECT_TRUE(channel != NULL);
+ EXPECT_TRUE(channel != nullptr);
EXPECT_EQ(config.id, channel->id());
config.id = cricket::kMaxSctpSid + 1;
channel = pc_->CreateDataChannel("x", &config);
- EXPECT_TRUE(channel == NULL);
+ EXPECT_TRUE(channel == nullptr);
}
// Verifies that duplicated label is allowed for SCTP data channel.
@@ -1985,12 +1982,12 @@ TEST_F(PeerConnectionInterfaceTest, RenegotiationNeededForNewRtpDataChannel) {
CreatePeerConnection(&constraints);
rtc::scoped_refptr<DataChannelInterface> dc1 =
- pc_->CreateDataChannel("test1", NULL);
+ pc_->CreateDataChannel("test1", nullptr);
EXPECT_TRUE(observer_.renegotiation_needed_);
observer_.renegotiation_needed_ = false;
rtc::scoped_refptr<DataChannelInterface> dc2 =
- pc_->CreateDataChannel("test2", NULL);
+ pc_->CreateDataChannel("test2", nullptr);
EXPECT_TRUE(observer_.renegotiation_needed_);
}
@@ -2001,10 +1998,10 @@ TEST_F(PeerConnectionInterfaceTest, DataChannelCloseWhenPeerConnectionClose) {
CreatePeerConnection(&constraints);
rtc::scoped_refptr<DataChannelInterface> data1 =
- pc_->CreateDataChannel("test1", NULL);
+ pc_->CreateDataChannel("test1", nullptr);
rtc::scoped_refptr<DataChannelInterface> data2 =
- pc_->CreateDataChannel("test2", NULL);
- ASSERT_TRUE(data1 != NULL);
+ pc_->CreateDataChannel("test2", nullptr);
+ ASSERT_TRUE(data1 != nullptr);
std::unique_ptr<MockDataChannelObserver> observer1(
new MockDataChannelObserver(data1));
std::unique_ptr<MockDataChannelObserver> observer2(
@@ -2026,7 +2023,7 @@ TEST_F(PeerConnectionInterfaceTest, TestRejectDataChannelInAnswer) {
CreatePeerConnection(&constraints);
rtc::scoped_refptr<DataChannelInterface> offer_channel(
- pc_->CreateDataChannel("offer_channel", NULL));
+ pc_->CreateDataChannel("offer_channel", nullptr));
CreateOfferAsLocalDescription();
@@ -2035,7 +2032,7 @@ TEST_F(PeerConnectionInterfaceTest, TestRejectDataChannelInAnswer) {
EXPECT_TRUE(pc_->local_description()->ToString(&sdp));
webrtc::JsepSessionDescription* answer = new webrtc::JsepSessionDescription(
SessionDescriptionInterface::kAnswer);
- EXPECT_TRUE(answer->Initialize(sdp, NULL));
+ EXPECT_TRUE(answer->Initialize(sdp, nullptr));
cricket::ContentInfo* data_info =
answer->description()->GetContentByName("data");
data_info->rejected = true;
@@ -2058,22 +2055,22 @@ TEST_F(PeerConnectionInterfaceTest, ReceiveFireFoxOffer) {
webrtc::kFireFoxSdpOffer, nullptr);
EXPECT_TRUE(DoSetSessionDescription(desc, false));
CreateAnswerAsLocalDescription();
- ASSERT_TRUE(pc_->local_description() != NULL);
- ASSERT_TRUE(pc_->remote_description() != NULL);
+ ASSERT_TRUE(pc_->local_description() != nullptr);
+ ASSERT_TRUE(pc_->remote_description() != nullptr);
const cricket::ContentInfo* content =
cricket::GetFirstAudioContent(pc_->local_description()->description());
- ASSERT_TRUE(content != NULL);
+ ASSERT_TRUE(content != nullptr);
EXPECT_FALSE(content->rejected);
content =
cricket::GetFirstVideoContent(pc_->local_description()->description());
- ASSERT_TRUE(content != NULL);
+ ASSERT_TRUE(content != nullptr);
EXPECT_FALSE(content->rejected);
#ifdef HAVE_SCTP
content =
cricket::GetFirstDataContent(pc_->local_description()->description());
- ASSERT_TRUE(content != NULL);
+ ASSERT_TRUE(content != nullptr);
EXPECT_TRUE(content->rejected);
#endif
}
@@ -2409,12 +2406,12 @@ TEST_F(PeerConnectionInterfaceTest, CloseAndTestMethods) {
ASSERT_FALSE(local_stream->GetAudioTracks().empty());
rtc::scoped_refptr<webrtc::DtmfSenderInterface> dtmf_sender(
pc_->CreateDtmfSender(local_stream->GetAudioTracks()[0]));
- EXPECT_TRUE(NULL == dtmf_sender); // local stream has been removed.
+ EXPECT_TRUE(nullptr == dtmf_sender); // local stream has been removed.
- EXPECT_TRUE(pc_->CreateDataChannel("test", NULL) == NULL);
+ EXPECT_TRUE(pc_->CreateDataChannel("test", nullptr) == nullptr);
- EXPECT_TRUE(pc_->local_description() != NULL);
- EXPECT_TRUE(pc_->remote_description() != NULL);
+ EXPECT_TRUE(pc_->local_description() != nullptr);
+ EXPECT_TRUE(pc_->remote_description() != nullptr);
std::unique_ptr<SessionDescriptionInterface> offer;
EXPECT_TRUE(DoCreateOffer(&offer, nullptr));
@@ -2423,15 +2420,13 @@ TEST_F(PeerConnectionInterfaceTest, CloseAndTestMethods) {
std::string sdp;
ASSERT_TRUE(pc_->remote_description()->ToString(&sdp));
- SessionDescriptionInterface* remote_offer =
- webrtc::CreateSessionDescription(SessionDescriptionInterface::kOffer,
- sdp, NULL);
+ SessionDescriptionInterface* remote_offer = webrtc::CreateSessionDescription(
+ SessionDescriptionInterface::kOffer, sdp, nullptr);
EXPECT_FALSE(DoSetRemoteDescription(remote_offer));
ASSERT_TRUE(pc_->local_description()->ToString(&sdp));
- SessionDescriptionInterface* local_offer =
- webrtc::CreateSessionDescription(SessionDescriptionInterface::kOffer,
- sdp, NULL);
+ SessionDescriptionInterface* local_offer = webrtc::CreateSessionDescription(
+ SessionDescriptionInterface::kOffer, sdp, nullptr);
EXPECT_FALSE(DoSetLocalDescription(local_offer));
}
@@ -2439,7 +2434,7 @@ TEST_F(PeerConnectionInterfaceTest, CloseAndTestMethods) {
TEST_F(PeerConnectionInterfaceTest, CloseAndGetStats) {
InitiateCall();
pc_->Close();
- DoGetStats(NULL);
+ DoGetStats(nullptr);
}
// NOTE: The series of tests below come from what used to be
@@ -2839,7 +2834,7 @@ TEST_F(PeerConnectionInterfaceTest,
// Change the ssrc of the audio and video track.
cricket::MediaContentDescription* desc =
cricket::GetFirstAudioContentDescription(modified_offer->description());
- ASSERT_TRUE(desc != NULL);
+ ASSERT_TRUE(desc != nullptr);
for (StreamParams& stream : desc->mutable_streams()) {
for (unsigned int& ssrc : stream.ssrcs) {
++ssrc;
@@ -2848,7 +2843,7 @@ TEST_F(PeerConnectionInterfaceTest,
desc =
cricket::GetFirstVideoContentDescription(modified_offer->description());
- ASSERT_TRUE(desc != NULL);
+ ASSERT_TRUE(desc != nullptr);
for (StreamParams& stream : desc->mutable_streams()) {
for (unsigned int& ssrc : stream.ssrcs) {
++ssrc;
« webrtc/base/event.cc ('K') | « webrtc/pc/peerconnectionfactory_unittest.cc ('k') | webrtc/pc/quicdatachannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698