Replace ASSERT by RTC_DCHECK in all non-test code.

webrtc/p2p/base/basicpacketsocketfactory.cc

 /*
  *  Copyright 2011 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.
  */
 
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 
 #include <string>
 
 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/asynctcpsocket.h"
 #include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/socketadapters.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/thread.h"
 
 namespace rtc {
 
 BasicPacketSocketFactory::BasicPacketSocketFactory()
@@ skipping 53 matching lines @@
 
   if (BindSocket(socket, local_address, min_port, max_port) < 0) {
     LOG(LS_ERROR) << "TCP bind failed with error "
                   << socket->GetError();
     delete socket;
     return NULL;
   }
 
   // If using fake TLS, wrap the TCP socket in a pseudo-SSL socket.
   if (opts & PacketSocketFactory::OPT_TLS_FAKE) {
-    ASSERT(!(opts & PacketSocketFactory::OPT_TLS));
+    RTC_DCHECK(!(opts & PacketSocketFactory::OPT_TLS));
     socket = new AsyncSSLSocket(socket);
   }
 
   // Set TCP_NODELAY (via OPT_NODELAY) for improved performance.
   // See http://go/gtalktcpnodelayexperiment
   socket->SetOption(Socket::OPT_NODELAY, 1);
 
   if (opts & PacketSocketFactory::OPT_STUN)
     return new cricket::AsyncStunTCPSocket(socket, true);
 
@@ skipping 23 matching lines @@
   } else if (proxy_info.type == PROXY_HTTPS) {
     socket =
         new AsyncHttpsProxySocket(socket, user_agent, proxy_info.address,
                                   proxy_info.username, proxy_info.password);
   }
 
   // Assert that at most one TLS option is used.
   int tlsOpts =
       opts & (PacketSocketFactory::OPT_TLS | PacketSocketFactory::OPT_TLS_FAKE |
               PacketSocketFactory::OPT_TLS_INSECURE);
-  ASSERT((tlsOpts & (tlsOpts - 1)) == 0);
+  RTC_DCHECK((tlsOpts & (tlsOpts - 1)) == 0);
 
   if ((tlsOpts & PacketSocketFactory::OPT_TLS) ||
       (tlsOpts & PacketSocketFactory::OPT_TLS_INSECURE)) {
     // Using TLS, wrap the socket in an SSL adapter.
     SSLAdapter* ssl_adapter = SSLAdapter::Create(socket);
     if (!ssl_adapter) {
       return NULL;
     }
 
     if (tlsOpts & PacketSocketFactory::OPT_TLS_INSECURE) {
@@ skipping 50 matching lines @@
     // Otherwise, try to find a port in the provided range.
     for (int port = min_port; ret < 0 && port <= max_port; ++port) {
       ret = socket->Bind(SocketAddress(local_address.ipaddr(), port));
     }
   }
   return ret;
 }
 
 SocketFactory* BasicPacketSocketFactory::socket_factory() {
   if (thread_) {
-    ASSERT(thread_ == Thread::Current());
+    RTC_DCHECK(thread_ == Thread::Current());
     return thread_->socketserver();
   } else {
     return socket_factory_;
   }
 }
 
 }  // namespace rtc