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

Unified Diff: webrtc/voice_engine/transmit_mixer_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/voice_engine/transmit_mixer_unittest.cc
diff --git a/webrtc/voice_engine/transmit_mixer_unittest.cc b/webrtc/voice_engine/transmit_mixer_unittest.cc
index bd390ae1d5a41f477feda79b13e34cfed42688e8..0d30f28b5f4bc739baea20118c558ca592dab6c6 100644
--- a/webrtc/voice_engine/transmit_mixer_unittest.cc
+++ b/webrtc/voice_engine/transmit_mixer_unittest.cc
@@ -28,11 +28,11 @@ class MediaCallback : public VoEMediaProcess {
// TODO(andrew): Mock VoEMediaProcess, and verify the behavior when calling
// PrepareDemux().
TEST(TransmitMixerTest, RegisterExternalMediaCallback) {
- TransmitMixer* tm = NULL;
+ TransmitMixer* tm = nullptr;
ASSERT_EQ(0, TransmitMixer::Create(tm, 0));
- ASSERT_TRUE(tm != NULL);
+ ASSERT_TRUE(tm != nullptr);
MediaCallback callback;
- EXPECT_EQ(-1, tm->RegisterExternalMediaProcessing(NULL,
+ EXPECT_EQ(-1, tm->RegisterExternalMediaProcessing(nullptr,
kRecordingPreprocessing));
EXPECT_EQ(-1, tm->RegisterExternalMediaProcessing(&callback,
kPlaybackPerChannel));

Powered by Google App Engine
This is Rietveld 408576698