| Index: webrtc/pc/test/peerconnectiontestwrapper.cc
|
| diff --git a/webrtc/pc/test/peerconnectiontestwrapper.cc b/webrtc/pc/test/peerconnectiontestwrapper.cc
|
| index c4336996528ae2fcbb3d45ea931d3774e1b061ca..26259b9528f2c2225108882ccfc3ed57ad765aa9 100644
|
| --- a/webrtc/pc/test/peerconnectiontestwrapper.cc
|
| +++ b/webrtc/pc/test/peerconnectiontestwrapper.cc
|
| @@ -64,13 +64,13 @@ bool PeerConnectionTestWrapper::CreatePc(
|
| new cricket::FakePortAllocator(network_thread_, nullptr));
|
|
|
| fake_audio_capture_module_ = FakeAudioCaptureModule::Create();
|
| - if (fake_audio_capture_module_ == NULL) {
|
| + if (fake_audio_capture_module_ == nullptr) {
|
| return false;
|
| }
|
|
|
| peer_connection_factory_ = webrtc::CreatePeerConnectionFactory(
|
| network_thread_, worker_thread_, rtc::Thread::Current(),
|
| - fake_audio_capture_module_, NULL, NULL);
|
| + fake_audio_capture_module_, nullptr, nullptr);
|
| if (!peer_connection_factory_) {
|
| return false;
|
| }
|
| @@ -81,7 +81,7 @@ bool PeerConnectionTestWrapper::CreatePc(
|
| config, constraints, std::move(port_allocator), std::move(cert_generator),
|
| this);
|
|
|
| - return peer_connection_.get() != NULL;
|
| + return peer_connection_.get() != nullptr;
|
| }
|
|
|
| rtc::scoped_refptr<webrtc::DataChannelInterface>
|
| @@ -149,7 +149,7 @@ void PeerConnectionTestWrapper::CreateAnswer(
|
|
|
| void PeerConnectionTestWrapper::ReceiveOfferSdp(const std::string& sdp) {
|
| SetRemoteDescription(SessionDescriptionInterface::kOffer, sdp);
|
| - CreateAnswer(NULL);
|
| + CreateAnswer(nullptr);
|
| }
|
|
|
| void PeerConnectionTestWrapper::ReceiveAnswerSdp(const std::string& sdp) {
|
| @@ -165,7 +165,7 @@ void PeerConnectionTestWrapper::SetLocalDescription(const std::string& type,
|
| observer(new rtc::RefCountedObject<
|
| MockSetSessionDescriptionObserver>());
|
| peer_connection_->SetLocalDescription(
|
| - observer, webrtc::CreateSessionDescription(type, sdp, NULL));
|
| + observer, webrtc::CreateSessionDescription(type, sdp, nullptr));
|
| }
|
|
|
| void PeerConnectionTestWrapper::SetRemoteDescription(const std::string& type,
|
| @@ -177,14 +177,14 @@ void PeerConnectionTestWrapper::SetRemoteDescription(const std::string& type,
|
| observer(new rtc::RefCountedObject<
|
| MockSetSessionDescriptionObserver>());
|
| peer_connection_->SetRemoteDescription(
|
| - observer, webrtc::CreateSessionDescription(type, sdp, NULL));
|
| + observer, webrtc::CreateSessionDescription(type, sdp, nullptr));
|
| }
|
|
|
| void PeerConnectionTestWrapper::AddIceCandidate(const std::string& sdp_mid,
|
| int sdp_mline_index,
|
| const std::string& candidate) {
|
| std::unique_ptr<webrtc::IceCandidateInterface> owned_candidate(
|
| - webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, candidate, NULL));
|
| + webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, candidate, nullptr));
|
| EXPECT_TRUE(peer_connection_->AddIceCandidate(owned_candidate.get()));
|
| }
|
|
|
|
|