Index: webrtc/pc/webrtcsdp_unittest.cc |
diff --git a/webrtc/pc/webrtcsdp_unittest.cc b/webrtc/pc/webrtcsdp_unittest.cc |
index 1a6a212cdd9f0f1ad704088594e8e76cbc285575..b058e7c505592e727f639edcf278b81aed2f4f3e 100644 |
--- a/webrtc/pc/webrtcsdp_unittest.cc |
+++ b/webrtc/pc/webrtcsdp_unittest.cc |
@@ -769,12 +769,12 @@ static const char kDummyString[] = "dummy"; |
static bool SdpDeserialize(const std::string& message, |
JsepSessionDescription* jdesc) { |
- return webrtc::SdpDeserialize(message, jdesc, NULL); |
+ return webrtc::SdpDeserialize(message, jdesc, nullptr); |
} |
static bool SdpDeserializeCandidate(const std::string& message, |
JsepIceCandidate* candidate) { |
- return webrtc::SdpDeserializeCandidate(message, candidate, NULL); |
+ return webrtc::SdpDeserializeCandidate(message, candidate, nullptr); |
} |
// Add some extra |newlines| to the |message| after |line|. |
@@ -1385,7 +1385,7 @@ class WebRtcSdpTest : public testing::Test { |
void AddIceOptions(const std::string& content_name, |
const std::vector<std::string>& transport_options) { |
- ASSERT_TRUE(desc_.GetTransportInfoByName(content_name) != NULL); |
+ ASSERT_TRUE(desc_.GetTransportInfoByName(content_name) != nullptr); |
cricket::TransportInfo transport_info = |
*(desc_.GetTransportInfoByName(content_name)); |
desc_.RemoveTransportInfoByName(content_name); |
@@ -1396,7 +1396,7 @@ class WebRtcSdpTest : public testing::Test { |
void SetIceUfragPwd(const std::string& content_name, |
const std::string& ice_ufrag, |
const std::string& ice_pwd) { |
- ASSERT_TRUE(desc_.GetTransportInfoByName(content_name) != NULL); |
+ ASSERT_TRUE(desc_.GetTransportInfoByName(content_name) != nullptr); |
cricket::TransportInfo transport_info = |
*(desc_.GetTransportInfoByName(content_name)); |
desc_.RemoveTransportInfoByName(content_name); |
@@ -1647,7 +1647,7 @@ class WebRtcSdpTest : public testing::Test { |
EXPECT_TRUE(webrtc::SdpDeserialize(sdp, jdesc_output, &error)); |
const ContentInfo* ac = GetFirstAudioContent(jdesc_output->description()); |
- ASSERT_TRUE(ac != NULL); |
+ ASSERT_TRUE(ac != nullptr); |
const AudioContentDescription* acd = |
static_cast<const AudioContentDescription*>(ac->description); |
ASSERT_FALSE(acd->codecs().empty()); |
@@ -1667,7 +1667,7 @@ class WebRtcSdpTest : public testing::Test { |
} |
const ContentInfo* vc = GetFirstVideoContent(jdesc_output->description()); |
- ASSERT_TRUE(vc != NULL); |
+ ASSERT_TRUE(vc != nullptr); |
const VideoContentDescription* vcd = |
static_cast<const VideoContentDescription*>(vc->description); |
ASSERT_FALSE(vcd->codecs().empty()); |
@@ -1709,7 +1709,7 @@ class WebRtcSdpTest : public testing::Test { |
SdpParseError error; |
EXPECT_TRUE(webrtc::SdpDeserialize(sdp, jdesc_output, &error)); |
const ContentInfo* ac = GetFirstAudioContent(jdesc_output->description()); |
- ASSERT_TRUE(ac != NULL); |
+ ASSERT_TRUE(ac != nullptr); |
const AudioContentDescription* acd = |
static_cast<const AudioContentDescription*>(ac->description); |
ASSERT_FALSE(acd->codecs().empty()); |
@@ -1720,7 +1720,7 @@ class WebRtcSdpTest : public testing::Test { |
cricket::kParamValueEmpty))); |
const ContentInfo* vc = GetFirstVideoContent(jdesc_output->description()); |
- ASSERT_TRUE(vc != NULL); |
+ ASSERT_TRUE(vc != nullptr); |
const VideoContentDescription* vcd = |
static_cast<const VideoContentDescription*>(vc->description); |
ASSERT_FALSE(vcd->codecs().empty()); |
@@ -2700,7 +2700,7 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelAndNewPort) { |
// note: mutant's owned by jdesc now. |
ASSERT_TRUE(jdesc.Initialize(mutant, kSessionId, kSessionVersion)); |
- mutant = NULL; |
+ mutant = nullptr; |
// Then get the deserialized JsepSessionDescription. |
std::string sdp_with_data = kSdpString; |
@@ -2933,7 +2933,7 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithReorderedPltypes) { |
EXPECT_TRUE(SdpDeserialize(kSdpWithReorderedPlTypesString, &jdesc_output)); |
const ContentInfo* ac = GetFirstAudioContent(jdesc_output.description()); |
- ASSERT_TRUE(ac != NULL); |
+ ASSERT_TRUE(ac != nullptr); |
const AudioContentDescription* acd = |
static_cast<const AudioContentDescription*>(ac->description); |
ASSERT_FALSE(acd->codecs().empty()); |
@@ -2988,7 +2988,7 @@ TEST_F(WebRtcSdpTest, DeserializeVideoFmtp) { |
webrtc::SdpDeserialize(kSdpWithFmtpString, &jdesc_output, &error)); |
const ContentInfo* vc = GetFirstVideoContent(jdesc_output.description()); |
- ASSERT_TRUE(vc != NULL); |
+ ASSERT_TRUE(vc != nullptr); |
const VideoContentDescription* vcd = |
static_cast<const VideoContentDescription*>(vc->description); |
ASSERT_FALSE(vcd->codecs().empty()); |
@@ -3023,10 +3023,10 @@ TEST_F(WebRtcSdpTest, DeserializeVideoFmtpWithSprops) { |
webrtc::SdpDeserialize(kSdpWithFmtpString, &jdesc_output, &error)); |
const ContentInfo* vc = GetFirstVideoContent(jdesc_output.description()); |
- ASSERT_TRUE(vc != NULL); |
+ ASSERT_TRUE(vc != nullptr); |
const VideoContentDescription* vcd = |
static_cast<const VideoContentDescription*>(vc->description); |
- ASSERT_TRUE(vcd != NULL); |
+ ASSERT_TRUE(vcd != nullptr); |
ASSERT_FALSE(vcd->codecs().empty()); |
cricket::VideoCodec h264 = vcd->codecs()[0]; |
EXPECT_EQ("H264", h264.name); |
@@ -3058,7 +3058,7 @@ TEST_F(WebRtcSdpTest, DeserializeVideoFmtpWithSpace) { |
&error)); |
const ContentInfo* vc = GetFirstVideoContent(jdesc_output.description()); |
- ASSERT_TRUE(vc != NULL); |
+ ASSERT_TRUE(vc != nullptr); |
const VideoContentDescription* vcd = |
static_cast<const VideoContentDescription*>(vc->description); |
ASSERT_FALSE(vcd->codecs().empty()); |