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

Unified Diff: webrtc/pc/jsepsessiondescription_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/jsepsessiondescription_unittest.cc
diff --git a/webrtc/pc/jsepsessiondescription_unittest.cc b/webrtc/pc/jsepsessiondescription_unittest.cc
index f692457f7ebf351cbdf9f3c7ee912f2560a8655f..5716e5122bd573b9a10c37fd2eddab65f28427e9 100644
--- a/webrtc/pc/jsepsessiondescription_unittest.cc
+++ b/webrtc/pc/jsepsessiondescription_unittest.cc
@@ -59,12 +59,12 @@ static cricket::SessionDescription* CreateCricketSessionDescription() {
cricket::CN_AUDIO,
cricket::TransportDescription(
std::vector<std::string>(), kCandidateUfragVoice, kCandidatePwdVoice,
- cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, NULL))));
+ cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, nullptr))));
EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo(
cricket::CN_VIDEO,
cricket::TransportDescription(
std::vector<std::string>(), kCandidateUfragVideo, kCandidatePwdVideo,
- cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, NULL))));
+ cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, nullptr))));
return desc;
}
@@ -94,7 +94,7 @@ class JsepSessionDescriptionTest : public testing::Test {
SessionDescriptionInterface* DeSerialize(const std::string& sdp) {
JsepSessionDescription* desc(new JsepSessionDescription("dummy"));
- EXPECT_TRUE(desc->Initialize(sdp, NULL));
+ EXPECT_TRUE(desc->Initialize(sdp, nullptr));
return desc;
}
@@ -113,10 +113,10 @@ TEST_F(JsepSessionDescriptionTest, AddCandidateWithoutMid) {
JsepIceCandidate jsep_candidate("", 0, candidate_);
EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate));
const IceCandidateCollection* ice_candidates = jsep_desc_->candidates(0);
- ASSERT_TRUE(ice_candidates != NULL);
+ ASSERT_TRUE(ice_candidates != nullptr);
EXPECT_EQ(1u, ice_candidates->count());
const IceCandidateInterface* ice_candidate = ice_candidates->at(0);
- ASSERT_TRUE(ice_candidate != NULL);
+ ASSERT_TRUE(ice_candidate != nullptr);
candidate_.set_username(kCandidateUfragVoice);
candidate_.set_password(kCandidatePwdVoice);
EXPECT_TRUE(ice_candidate->candidate().IsEquivalent(candidate_));
@@ -133,10 +133,10 @@ TEST_F(JsepSessionDescriptionTest, AddAndRemoveCandidatesWithMid) {
EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate));
EXPECT_EQ(0u, jsep_desc_->candidates(0)->count());
const IceCandidateCollection* ice_candidates = jsep_desc_->candidates(1);
- ASSERT_TRUE(ice_candidates != NULL);
+ ASSERT_TRUE(ice_candidates != nullptr);
EXPECT_EQ(1u, ice_candidates->count());
const IceCandidateInterface* ice_candidate = ice_candidates->at(0);
- ASSERT_TRUE(ice_candidate != NULL);
+ ASSERT_TRUE(ice_candidate != nullptr);
candidate_.set_username(kCandidateUfragVideo);
candidate_.set_password(kCandidatePwdVideo);
EXPECT_TRUE(ice_candidate->candidate().IsEquivalent(candidate_));
@@ -156,10 +156,10 @@ TEST_F(JsepSessionDescriptionTest, AddCandidateAlreadyHasUfrag) {
JsepIceCandidate jsep_candidate("audio", 0, candidate_);
EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate));
const IceCandidateCollection* ice_candidates = jsep_desc_->candidates(0);
- ASSERT_TRUE(ice_candidates != NULL);
+ ASSERT_TRUE(ice_candidates != nullptr);
EXPECT_EQ(1u, ice_candidates->count());
const IceCandidateInterface* ice_candidate = ice_candidates->at(0);
- ASSERT_TRUE(ice_candidate != NULL);
+ ASSERT_TRUE(ice_candidate != nullptr);
candidate_.set_username(kCandidateUfrag);
candidate_.set_password(kCandidatePwd);
EXPECT_TRUE(ice_candidate->candidate().IsEquivalent(candidate_));

Powered by Google App Engine
This is Rietveld 408576698