Replace CHECK(x && y) with two separate CHECK() calls

webrtc/pc/datachannel.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 264 matching lines @@
   receive_ssrc_set_ = true;
   UpdateState();
 }
 
 // The remote peer request that this channel shall be closed.
 void DataChannel::RemotePeerRequestClose() {
   DoClose();
 }
 
 void DataChannel::SetSctpSid(int sid) {
-  RTC_DCHECK(config_.id < 0 && sid >= 0 &&
-             data_channel_type_ == cricket::DCT_SCTP);
+  RTC_DCHECK_LT(config_.id, 0);
+  RTC_DCHECK_GE(sid, 0);
+  RTC_DCHECK_EQ(data_channel_type_, cricket::DCT_SCTP);
   if (config_.id == sid) {
     return;
   }
 
   config_.id = sid;
   provider_->AddSctpDataStream(sid);
 }
 
 void DataChannel::OnTransportChannelCreated() {
   RTC_DCHECK(data_channel_type_ == cricket::DCT_SCTP);
@@ skipping 314 matching lines @@
   }
 }
 
 void DataChannel::QueueControlMessage(const rtc::CopyOnWriteBuffer& buffer) {
   queued_control_data_.Push(new DataBuffer(buffer, true));
 }
 
 bool DataChannel::SendControlMessage(const rtc::CopyOnWriteBuffer& buffer) {
   bool is_open_message = handshake_state_ == kHandshakeShouldSendOpen;
 
-  RTC_DCHECK(data_channel_type_ == cricket::DCT_SCTP && writable_ &&
-             config_.id >= 0 && (!is_open_message || !config_.negotiated));
+  RTC_DCHECK_EQ(data_channel_type_, cricket::DCT_SCTP);
+  RTC_DCHECK(writable_);
+  RTC_DCHECK_GE(config_.id, 0);
+  RTC_DCHECK(!is_open_message || !config_.negotiated);
 
   cricket::SendDataParams send_params;
   send_params.sid = config_.id;
   // Send data as ordered before we receive any message from the remote peer to
   // make sure the remote peer will not receive any data before it receives the
   // OPEN message.
   send_params.ordered = config_.ordered || is_open_message;
   send_params.type = cricket::DMT_CONTROL;
 
   cricket::SendDataResult send_result = cricket::SDR_SUCCESS;
@@ skipping 10 matching lines @@
     QueueControlMessage(buffer);
   } else {
     LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send"
                   << " the CONTROL message, send_result = " << send_result;
     Close();
   }
   return retval;
 }
 
 }  // namespace webrtc