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

Unified Diff: webrtc/base/network.cc

Issue 2620303003: Replace ASSERT by RTC_DCHECK in all non-test code. (Closed)
Patch Set: Also replace NDEBUG checks in taskrunner.h. 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
Index: webrtc/base/network.cc
diff --git a/webrtc/base/network.cc b/webrtc/base/network.cc
index a999fcb45c57cb008c9c4b64c9156af073088863..c7343635dd0df89c865fe9b9aceed50d81d045b3 100644
--- a/webrtc/base/network.cc
+++ b/webrtc/base/network.cc
@@ -266,7 +266,7 @@ void NetworkManagerBase::MergeNetworkList(const NetworkList& new_networks,
if (current_list.ips[0].family() == AF_INET) {
stats->ipv4_network_count++;
} else {
- ASSERT(current_list.ips[0].family() == AF_INET6);
+ RTC_DCHECK(current_list.ips[0].family() == AF_INET6);
stats->ipv6_network_count++;
}
}
@@ -302,7 +302,7 @@ void NetworkManagerBase::MergeNetworkList(const NetworkList& new_networks,
if (!existing_net->active()) {
*changed = true;
}
- ASSERT(net->active());
+ RTC_DCHECK(net->active());
if (existing_net != net) {
delete net;
}
@@ -740,7 +740,7 @@ void BasicNetworkManager::StartUpdating() {
}
void BasicNetworkManager::StopUpdating() {
- ASSERT(Thread::Current() == thread_);
+ RTC_DCHECK(Thread::Current() == thread_);
if (!start_count_)
return;
@@ -826,9 +826,9 @@ AdapterType BasicNetworkManager::GetAdapterTypeFromName(
}
IPAddress BasicNetworkManager::QueryDefaultLocalAddress(int family) const {
- ASSERT(thread_ == Thread::Current());
- ASSERT(thread_->socketserver() != nullptr);
- ASSERT(family == AF_INET || family == AF_INET6);
+ RTC_DCHECK(thread_ == Thread::Current());
+ RTC_DCHECK(thread_->socketserver() != nullptr);
+ RTC_DCHECK(family == AF_INET || family == AF_INET6);
std::unique_ptr<AsyncSocket> socket(
thread_->socketserver()->CreateAsyncSocket(family, SOCK_DGRAM));
@@ -855,7 +855,7 @@ void BasicNetworkManager::UpdateNetworksOnce() {
if (!start_count_)
return;
- ASSERT(Thread::Current() == thread_);
+ RTC_DCHECK(Thread::Current() == thread_);
NetworkList list;
if (!CreateNetworks(false, &list)) {

Powered by Google App Engine
This is Rietveld 408576698