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

Unified Diff: webrtc/pc/mediastream_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
Index: webrtc/pc/mediastream_unittest.cc
diff --git a/webrtc/pc/mediastream_unittest.cc b/webrtc/pc/mediastream_unittest.cc
index e2e3985507cd31b693d95b7b7b3040715a46323d..a4af597f9bd053389466091b41818e2297adedfc 100644
--- a/webrtc/pc/mediastream_unittest.cc
+++ b/webrtc/pc/mediastream_unittest.cc
@@ -54,16 +54,16 @@ class MediaStreamTest: public testing::Test {
protected:
virtual void SetUp() {
stream_ = MediaStream::Create(kStreamLabel1);
- ASSERT_TRUE(stream_.get() != NULL);
+ ASSERT_TRUE(stream_.get() != nullptr);
video_track_ =
VideoTrack::Create(kVideoTrackId, FakeVideoTrackSource::Create());
- ASSERT_TRUE(video_track_.get() != NULL);
+ ASSERT_TRUE(video_track_.get() != nullptr);
EXPECT_EQ(MediaStreamTrackInterface::kLive, video_track_->state());
- audio_track_ = AudioTrack::Create(kAudioTrackId, NULL);
+ audio_track_ = AudioTrack::Create(kAudioTrackId, nullptr);
- ASSERT_TRUE(audio_track_.get() != NULL);
+ ASSERT_TRUE(audio_track_.get() != nullptr);
EXPECT_EQ(MediaStreamTrackInterface::kLive, audio_track_->state());
EXPECT_TRUE(stream_->AddTrack(video_track_));
@@ -135,8 +135,10 @@ TEST_F(MediaStreamTest, RemoveTrack) {
EXPECT_EQ(0u, stream_->GetVideoTracks().size());
EXPECT_EQ(0u, stream_->GetVideoTracks().size());
- EXPECT_FALSE(stream_->RemoveTrack(static_cast<AudioTrackInterface*>(NULL)));
- EXPECT_FALSE(stream_->RemoveTrack(static_cast<VideoTrackInterface*>(NULL)));
+ EXPECT_FALSE(
+ stream_->RemoveTrack(static_cast<AudioTrackInterface*>(nullptr)));
+ EXPECT_FALSE(
+ stream_->RemoveTrack(static_cast<VideoTrackInterface*>(nullptr)));
}
TEST_F(MediaStreamTest, ChangeVideoTrack) {

Powered by Google App Engine
This is Rietveld 408576698