Replace the easy cases of VERIFY usage.

webrtc/pc/peerconnection.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 996 matching lines @@
     ret.push_back(receiver.get());
   }
   return ret;
 }
 
 bool PeerConnection::GetStats(StatsObserver* observer,
                               MediaStreamTrackInterface* track,
                               StatsOutputLevel level) {
   TRACE_EVENT0("webrtc", "PeerConnection::GetStats");
   RTC_DCHECK(signaling_thread()->IsCurrent());
-  if (!VERIFY(observer != NULL)) {
-    LOG(LS_ERROR) << "GetStats - observer is NULL.";
-    return false;
-  }
+  RTC_DCHECK(observer != nullptr);

[kwiberg-webrtc, 2017/01/30 10:12:49]

RTC_DCHECK_NE? Or will that not compile?

(You could also check just "observer", with implicit pointer->bool conversion,
but I'll leave that style choice up to you.)

Are you sure these will never trigger? Otherwise we'll get crashes here that we
didn't get before.

[nisse-webrtc, 2017/01/30 10:58:41]

It fails to compile, with errors related to << and MakeCheckOpString.
I'll change to the more concise implicit bool conversion.
I'm not sure of anything... At least, there's nothing in the comments in
peerconnectioninterface.h to indicate that the observers are optional. Who
should I ask?

 
   stats_->UpdateStats(level);
   // The StatsCollector is used to tell if a track is valid because it may
   // remember tracks that the PeerConnection previously removed.
   if (track && !stats_->IsValidTrack(track->id())) {
     LOG(LS_WARNING) << "GetStats is called with an invalid track: "
                     << track->id();
     return false;
   }
   signaling_thread()->Post(RTC_FROM_HERE, this, MSG_GETSTATS,
@@ skipping 59 matching lines @@
   if (session_->data_channel_type() == cricket::DCT_RTP || first_datachannel) {
     observer_->OnRenegotiationNeeded();
   }
 
   return DataChannelProxy::Create(signaling_thread(), channel.get());
 }
 
 void PeerConnection::CreateOffer(CreateSessionDescriptionObserver* observer,
                                  const MediaConstraintsInterface* constraints) {
   TRACE_EVENT0("webrtc", "PeerConnection::CreateOffer");
-  if (!VERIFY(observer != nullptr)) {
-    LOG(LS_ERROR) << "CreateOffer - observer is NULL.";
-    return;
-  }
+  RTC_DCHECK(observer != nullptr);
   RTCOfferAnswerOptions options;
 
   bool value;
   size_t mandatory_constraints = 0;
 
   if (FindConstraint(constraints,
                      MediaConstraintsInterface::kOfferToReceiveAudio,
                      &value,
                      &mandatory_constraints)) {
     options.offer_to_receive_audio =
@@ skipping 28 matching lines @@
                      &mandatory_constraints)) {
     options.use_rtp_mux = value;
   }
 
   CreateOffer(observer, options);
 }
 
 void PeerConnection::CreateOffer(CreateSessionDescriptionObserver* observer,
                                  const RTCOfferAnswerOptions& options) {
   TRACE_EVENT0("webrtc", "PeerConnection::CreateOffer");
-  if (!VERIFY(observer != nullptr)) {
-    LOG(LS_ERROR) << "CreateOffer - observer is NULL.";
-    return;
-  }
+  RTC_DCHECK(observer != nullptr);
 
   cricket::MediaSessionOptions session_options;
   if (!GetOptionsForOffer(options, &session_options)) {
     std::string error = "CreateOffer called with invalid options.";
     LOG(LS_ERROR) << error;
     PostCreateSessionDescriptionFailure(observer, error);
     return;
   }
 
   session_->CreateOffer(observer, options, session_options);
 }
 
 void PeerConnection::CreateAnswer(
     CreateSessionDescriptionObserver* observer,
     const MediaConstraintsInterface* constraints) {
   TRACE_EVENT0("webrtc", "PeerConnection::CreateAnswer");
-  if (!VERIFY(observer != nullptr)) {
-    LOG(LS_ERROR) << "CreateAnswer - observer is NULL.";
-    return;
-  }
+  RTC_DCHECK(observer != nullptr);
 
   cricket::MediaSessionOptions session_options;
   if (!GetOptionsForAnswer(constraints, &session_options)) {
     std::string error = "CreateAnswer called with invalid constraints.";
     LOG(LS_ERROR) << error;
     PostCreateSessionDescriptionFailure(observer, error);
     return;
   }
 
   session_->CreateAnswer(observer, session_options);
 }
 
 void PeerConnection::CreateAnswer(CreateSessionDescriptionObserver* observer,
                                   const RTCOfferAnswerOptions& options) {
   TRACE_EVENT0("webrtc", "PeerConnection::CreateAnswer");
-  if (!VERIFY(observer != nullptr)) {
-    LOG(LS_ERROR) << "CreateAnswer - observer is NULL.";
-    return;
-  }
+  RTC_DCHECK(observer != nullptr);
 
   cricket::MediaSessionOptions session_options;
   if (!GetOptionsForAnswer(options, &session_options)) {
     std::string error = "CreateAnswer called with invalid options.";
     LOG(LS_ERROR) << error;
     PostCreateSessionDescriptionFailure(observer, error);
     return;
   }
 
   session_->CreateAnswer(observer, session_options);
 }
 
 void PeerConnection::SetLocalDescription(
     SetSessionDescriptionObserver* observer,
     SessionDescriptionInterface* desc) {
   TRACE_EVENT0("webrtc", "PeerConnection::SetLocalDescription");
   if (IsClosed()) {
     return;
   }
-  if (!VERIFY(observer != nullptr)) {
-    LOG(LS_ERROR) << "SetLocalDescription - observer is NULL.";
-    return;
-  }
+  RTC_DCHECK(observer != nullptr);
   if (!desc) {
     PostSetSessionDescriptionFailure(observer, "SessionDescription is NULL.");
     return;
   }
   // Update stats here so that we have the most recent stats for tracks and
   // streams that might be removed by updating the session description.
   stats_->UpdateStats(kStatsOutputLevelStandard);
   std::string error;
   if (!session_->SetLocalDescription(desc, &error)) {
     PostSetSessionDescriptionFailure(observer, error);
@@ skipping 58 matching lines @@
   session_->MaybeStartGathering();
 }
 
 void PeerConnection::SetRemoteDescription(
     SetSessionDescriptionObserver* observer,
     SessionDescriptionInterface* desc) {
   TRACE_EVENT0("webrtc", "PeerConnection::SetRemoteDescription");
   if (IsClosed()) {
     return;
   }
-  if (!VERIFY(observer != nullptr)) {
-    LOG(LS_ERROR) << "SetRemoteDescription - observer is NULL.";
-    return;
-  }
+  RTC_DCHECK(observer != nullptr);
   if (!desc) {
     PostSetSessionDescriptionFailure(observer, "SessionDescription is NULL.");
     return;
   }
   // Update stats here so that we have the most recent stats for tracks and
   // streams that might be removed by updating the session description.
   stats_->UpdateStats(kStatsOutputLevelStandard);
   std::string error;
   if (!session_->SetRemoteDescription(desc, &error)) {
     PostSetSessionDescriptionFailure(observer, error);
@@ skipping 873 matching lines @@
 
   // Find new and active data channels.
   for (const cricket::StreamParams& params : streams) {
     // |it->sync_label| is actually the data channel label. The reason is that
     // we use the same naming of data channels as we do for
     // MediaStreams and Tracks.
     // For MediaStreams, the sync_label is the MediaStream label and the
     // track label is the same as |streamid|.
     const std::string& channel_label = params.sync_label;
     auto data_channel_it = rtp_data_channels_.find(channel_label);
-    if (!VERIFY(data_channel_it != rtp_data_channels_.end())) {
+    if (data_channel_it == rtp_data_channels_.end()) {
+      LOG(LS_ERROR) << "channel label not found";
       continue;
     }
     // Set the SSRC the data channel should use for sending.
     data_channel_it->second->SetSendSsrc(params.first_ssrc());
     existing_channels.push_back(data_channel_it->first);
   }
 
   UpdateClosingRtpDataChannels(existing_channels, true);
 }
 
@@ skipping 361 matching lines @@
 
 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file,
                                         int64_t max_size_bytes) {
   return event_log_->StartLogging(file, max_size_bytes);
 }
 
 void PeerConnection::StopRtcEventLog_w() {
   event_log_->StopLogging();
 }
 }  // namespace webrtc