| Index: webrtc/media/engine/webrtcvideoengine2.cc | 
| diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc | 
| index df796daedd01418962e12268b54ee386c5051016..59d73d0c937d6825d907d6176e7ed9a395fa501b 100644 | 
| --- a/webrtc/media/engine/webrtcvideoengine2.cc | 
| +++ b/webrtc/media/engine/webrtcvideoengine2.cc | 
| @@ -101,7 +101,7 @@ class WebRtcSimulcastEncoderFactory | 
|  | 
| webrtc::VideoEncoder* CreateVideoEncoder( | 
| const cricket::VideoCodec& codec) override { | 
| -    RTC_DCHECK(factory_ != NULL); | 
| +    RTC_DCHECK(factory_ != nullptr); | 
| // If it's a codec type we can simulcast, create a wrapped encoder. | 
| if (CodecNamesEq(codec.name.c_str(), kVp8CodecName)) { | 
| return new webrtc::SimulcastEncoderAdapter( | 
| @@ -423,7 +423,7 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::ConfigureVideoEncoderSettings( | 
| } | 
|  | 
| DefaultUnsignalledSsrcHandler::DefaultUnsignalledSsrcHandler() | 
| -    : default_recv_ssrc_(0), default_sink_(NULL) {} | 
| +    : default_recv_ssrc_(0), default_sink_(nullptr) {} | 
|  | 
| UnsignalledSsrcHandler::Action DefaultUnsignalledSsrcHandler::OnUnsignalledSsrc( | 
| WebRtcVideoChannel2* channel, | 
| @@ -461,8 +461,8 @@ void DefaultUnsignalledSsrcHandler::SetDefaultSink( | 
|  | 
| WebRtcVideoEngine2::WebRtcVideoEngine2() | 
| : initialized_(false), | 
| -      external_decoder_factory_(NULL), | 
| -      external_encoder_factory_(NULL) { | 
| +      external_decoder_factory_(nullptr), | 
| +      external_encoder_factory_(nullptr) { | 
| LOG(LS_INFO) << "WebRtcVideoEngine2::WebRtcVideoEngine2()"; | 
| } | 
|  | 
| @@ -1017,8 +1017,8 @@ bool WebRtcVideoChannel2::SetVideoSend( | 
| TRACE_EVENT0("webrtc", "SetVideoSend"); | 
| RTC_DCHECK(ssrc != 0); | 
| LOG(LS_INFO) << "SetVideoSend (ssrc= " << ssrc << ", enable = " << enable | 
| -               << ", options: " << (options ? options->ToString() : "nullptr") | 
| -               << ", source = " << (source ? "(source)" : "nullptr") << ")"; | 
| +               << ", options: " << (options ? options->ToString() : "null") | 
| +               << ", source = " << (source ? "(source)" : "null") << ")"; | 
|  | 
| rtc::CritScope stream_lock(&stream_crit_); | 
| const auto& kv = send_streams_.find(ssrc); | 
| @@ -1263,8 +1263,7 @@ bool WebRtcVideoChannel2::RemoveRecvStream(uint32_t ssrc) { | 
| bool WebRtcVideoChannel2::SetSink( | 
| uint32_t ssrc, | 
| rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) { | 
| -  LOG(LS_INFO) << "SetSink: ssrc:" << ssrc << " " | 
| -               << (sink ? "(ptr)" : "nullptr"); | 
| +  LOG(LS_INFO) << "SetSink: ssrc:" << ssrc << " " << (sink ? "(ptr)" : "null"); | 
| if (ssrc == 0) { | 
| default_unsignalled_ssrc_handler_.SetDefaultSink(this, sink); | 
| return true; | 
| @@ -1593,7 +1592,7 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::WebRtcVideoSendStream( | 
| } | 
|  | 
| WebRtcVideoChannel2::WebRtcVideoSendStream::~WebRtcVideoSendStream() { | 
| -  if (stream_ != NULL) { | 
| +  if (stream_ != nullptr) { | 
| call_->DestroyVideoSendStream(stream_); | 
| } | 
| DestroyVideoEncoder(&allocated_encoder_); | 
| @@ -1682,7 +1681,7 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoder( | 
| // This shouldn't happen, we should not be trying to create something we don't | 
| // support. | 
| RTC_NOTREACHED(); | 
| -  return AllocatedEncoder(NULL, cricket::VideoCodec(), false); | 
| +  return AllocatedEncoder(nullptr, cricket::VideoCodec(), false); | 
| } | 
|  | 
| void WebRtcVideoChannel2::WebRtcVideoSendStream::DestroyVideoEncoder( | 
| @@ -1904,7 +1903,7 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::ReconfigureEncoder() { | 
|  | 
| stream_->ReconfigureVideoEncoder(encoder_config.Copy()); | 
|  | 
| -  encoder_config.encoder_specific_settings = NULL; | 
| +  encoder_config.encoder_specific_settings = nullptr; | 
|  | 
| parameters_.encoder_config = std::move(encoder_config); | 
| } | 
| @@ -1961,7 +1960,7 @@ VideoSenderInfo WebRtcVideoChannel2::WebRtcVideoSendStream::GetVideoSenderInfo( | 
| parameters_.codec_settings->codec.id); | 
| } | 
|  | 
| -  if (stream_ == NULL) | 
| +  if (stream_ == nullptr) | 
| return info; | 
|  | 
| webrtc::VideoSendStream::Stats stats = stream_->GetStats(); | 
| @@ -2028,7 +2027,7 @@ VideoSenderInfo WebRtcVideoChannel2::WebRtcVideoSendStream::GetVideoSenderInfo( | 
| void WebRtcVideoChannel2::WebRtcVideoSendStream::FillBandwidthEstimationInfo( | 
| BandwidthEstimationInfo* bwe_info) { | 
| RTC_DCHECK_RUN_ON(&thread_checker_); | 
| -  if (stream_ == NULL) { | 
| +  if (stream_ == nullptr) { | 
| return; | 
| } | 
| webrtc::VideoSendStream::Stats stats = stream_->GetStats(); | 
| @@ -2044,7 +2043,7 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::FillBandwidthEstimationInfo( | 
|  | 
| void WebRtcVideoChannel2::WebRtcVideoSendStream::RecreateWebRtcStream() { | 
| RTC_DCHECK_RUN_ON(&thread_checker_); | 
| -  if (stream_ != NULL) { | 
| +  if (stream_ != nullptr) { | 
| call_->DestroyVideoSendStream(stream_); | 
| } | 
|  | 
| @@ -2065,7 +2064,7 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::RecreateWebRtcStream() { | 
| stream_ = call_->CreateVideoSendStream(std::move(config), | 
| parameters_.encoder_config.Copy()); | 
|  | 
| -  parameters_.encoder_config.encoder_specific_settings = NULL; | 
| +  parameters_.encoder_config.encoder_specific_settings = nullptr; | 
|  | 
| if (source_) { | 
| // Do not adapt resolution for screen content as this will likely result in | 
| @@ -2094,13 +2093,13 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream( | 
| const webrtc::FlexfecReceiveStream::Config& flexfec_config) | 
| : call_(call), | 
| stream_params_(sp), | 
| -      stream_(NULL), | 
| +      stream_(nullptr), | 
| default_stream_(default_stream), | 
| config_(std::move(config)), | 
| flexfec_config_(flexfec_config), | 
| flexfec_stream_(nullptr), | 
| external_decoder_factory_(external_decoder_factory), | 
| -      sink_(NULL), | 
| +      sink_(nullptr), | 
| first_frame_timestamp_(-1), | 
| estimated_remote_start_ntp_time_ms_(0) { | 
| config_.renderer = this; | 
| @@ -2167,11 +2166,11 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::CreateOrReuseVideoDecoder( | 
| } | 
| } | 
|  | 
| -  if (external_decoder_factory_ != NULL) { | 
| +  if (external_decoder_factory_ != nullptr) { | 
| webrtc::VideoDecoder* decoder = | 
| external_decoder_factory_->CreateVideoDecoderWithParams( | 
| type, {stream_params_.id}); | 
| -    if (decoder != NULL) { | 
| +    if (decoder != nullptr) { | 
| return AllocatedDecoder(decoder, type, true /* is_external */); | 
| } | 
| } | 
| @@ -2329,7 +2328,7 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::OnFrame( | 
| if (frame.ntp_time_ms() > 0) | 
| estimated_remote_start_ntp_time_ms_ = frame.ntp_time_ms() - elapsed_time_ms; | 
|  | 
| -  if (sink_ == NULL) { | 
| +  if (sink_ == nullptr) { | 
| LOG(LS_WARNING) << "VideoReceiveStream not connected to a VideoSink."; | 
| return; | 
| } | 
|  |