Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: webrtc/base/openssladapter.cc

Issue 2620303003: Replace ASSERT by RTC_DCHECK in all non-test code. (Closed)
Patch Set: Address final nits. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/networkmonitor.cc ('k') | webrtc/base/openssldigest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/openssladapter.cc
diff --git a/webrtc/base/openssladapter.cc b/webrtc/base/openssladapter.cc
index 259215239eaf907853ca2cba5d921382a05da8fb..430191641a72d7f4203a7ce466f23af2055cfb9e 100644
--- a/webrtc/base/openssladapter.cc
+++ b/webrtc/base/openssladapter.cc
@@ -28,6 +28,7 @@
#include <openssl/x509v3.h>
#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
#include "webrtc/base/common.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/openssl.h"
@@ -289,7 +290,7 @@ OpenSSLAdapter::~OpenSSLAdapter() {
void
OpenSSLAdapter::SetMode(SSLMode mode) {
- ASSERT(state_ == SSL_NONE);
+ RTC_DCHECK(state_ == SSL_NONE);
ssl_mode_ = mode;
}
@@ -318,7 +319,7 @@ OpenSSLAdapter::StartSSL(const char* hostname, bool restartable) {
int
OpenSSLAdapter::BeginSSL() {
LOG(LS_INFO) << "BeginSSL: " << ssl_host_name_;
- ASSERT(state_ == SSL_CONNECTING);
+ RTC_DCHECK(state_ == SSL_CONNECTING);
int err = 0;
BIO* bio = NULL;
@@ -370,7 +371,7 @@ ssl_error:
int
OpenSSLAdapter::ContinueSSL() {
- ASSERT(state_ == SSL_CONNECTING);
+ RTC_DCHECK(state_ == SSL_CONNECTING);
// Clear the DTLS timer
Thread::Current()->Clear(this, MSG_TIMEOUT);
@@ -627,7 +628,7 @@ void
OpenSSLAdapter::OnConnectEvent(AsyncSocket* socket) {
LOG(LS_INFO) << "OpenSSLAdapter::OnConnectEvent";
if (state_ != SSL_WAIT) {
- ASSERT(state_ == SSL_NONE);
+ RTC_DCHECK(state_ == SSL_NONE);
AsyncSocketAdapter::OnConnectEvent(socket);
return;
}
« no previous file with comments | « webrtc/base/networkmonitor.cc ('k') | webrtc/base/openssldigest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698