From a9dd4a1b1180feadc8f16ca1a5173310f1f11597 Mon Sep 17 00:00:00 2001
From: nisse <nisse@webrtc.org>
Date: Fri, 13 Jan 2017 07:08:34 -0800
Subject: [PATCH] Replace left-over ASSERTs in httpcommon.h and
 webrtcsession.cc.

BUG=webrtc:6424

Review-Url: https://codereview.webrtc.org/2630553003
Cr-Commit-Position: refs/heads/master@{#16055}
---
 webrtc/api/webrtcsession.cc | 2 +-
 webrtc/base/httpcommon.h    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/webrtc/api/webrtcsession.cc b/webrtc/api/webrtcsession.cc
index 30a0a7c25e..a0c72c853e 100644
--- a/webrtc/api/webrtcsession.cc
+++ b/webrtc/api/webrtcsession.cc
@@ -2374,7 +2374,7 @@ void WebRtcSession::DestroyTransport(const std::string& transport_name,
 }
 
 void WebRtcSession::DestroyRtcpTransport_n(const std::string& transport_name) {
-  ASSERT(network_thread()->IsCurrent());
+  RTC_DCHECK(network_thread()->IsCurrent());
   transport_controller_->DestroyTransportChannel_n(
       transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
 }
diff --git a/webrtc/base/httpcommon.h b/webrtc/base/httpcommon.h
index 3450b58b56..896b40e6a9 100644
--- a/webrtc/base/httpcommon.h
+++ b/webrtc/base/httpcommon.h
@@ -16,6 +16,7 @@
 #include <string>
 #include <vector>
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/stream.h"
@@ -254,14 +255,14 @@ public:
     if (val.empty()) {
       path_.assign(1, static_cast<CTYPE>('/'));
     } else {
-      ASSERT(val[0] == static_cast<CTYPE>('/'));
+      RTC_DCHECK(val[0] == static_cast<CTYPE>('/'));
       path_ = val;
     }
   }
   const string& path() const { return path_; }
 
   void set_query(const string& val) {
-    ASSERT(val.empty() || (val[0] == static_cast<CTYPE>('?')));
+    RTC_DCHECK(val.empty() || (val[0] == static_cast<CTYPE>('?')));
     query_ = val;
   }
   const string& query() const { return query_; }