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

webrtc/rtc_base/proxyserver.cc

 /*
  *  Copyright 2004 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 25 matching lines @@
        it != bindings_.end(); ++it) {
     delete (*it);
   }
 }
 
 SocketAddress ProxyServer::GetServerAddress() {
   return server_socket_->GetLocalAddress();
 }
 
 void ProxyServer::OnAcceptEvent(AsyncSocket* socket) {
-  RTC_DCHECK(socket != nullptr && socket == server_socket_.get());
+  RTC_DCHECK(socket);
+  RTC_DCHECK_EQ(socket, server_socket_.get());
   AsyncSocket* int_socket = socket->Accept(nullptr);
   AsyncProxyServerSocket* wrapped_socket = WrapSocket(int_socket);
   AsyncSocket* ext_socket = ext_factory_->CreateAsyncSocket(ext_ip_.family(),
                                                             SOCK_STREAM);
   if (ext_socket) {
     ext_socket->Bind(ext_ip_);
     bindings_.push_back(new ProxyBinding(wrapped_socket, ext_socket));
   } else {
     LOG(LS_ERROR) << "Unable to create external socket on proxy accept event";
   }
@@ skipping 20 matching lines @@
                                           &ProxyBinding::OnExternalConnect);
   ext_socket_->SignalReadEvent.connect(this, &ProxyBinding::OnExternalRead);
   ext_socket_->SignalWriteEvent.connect(this, &ProxyBinding::OnExternalWrite);
   ext_socket_->SignalCloseEvent.connect(this, &ProxyBinding::OnExternalClose);
 }
 
 ProxyBinding::~ProxyBinding() = default;
 
 void ProxyBinding::OnConnectRequest(AsyncProxyServerSocket* socket,
                                    const SocketAddress& addr) {
-  RTC_DCHECK(!connected_ && ext_socket_.get() != nullptr);
+  RTC_DCHECK(!connected_);
+  RTC_DCHECK(ext_socket_);
   ext_socket_->Connect(addr);
   // TODO: handle errors here
 }
 
 void ProxyBinding::OnInternalRead(AsyncSocket* socket) {
   Read(int_socket_.get(), &out_buffer_);
   Write(ext_socket_.get(), &out_buffer_);
 }
 
 void ProxyBinding::OnInternalWrite(AsyncSocket* socket) {
@@ skipping 49 matching lines @@
 
 void ProxyBinding::Destroy() {
   SignalDestroyed(this);
 }
 
 AsyncProxyServerSocket* SocksProxyServer::WrapSocket(AsyncSocket* socket) {
   return new AsyncSocksProxyServerSocket(socket);
 }
 
 }  // namespace rtc