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

Side by Side Diff: webrtc/base/networkmonitor.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 unified diff | Download patch
« no previous file with comments | « webrtc/base/network.cc ('k') | webrtc/base/openssladapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/base/networkmonitor.h" 11 #include "webrtc/base/networkmonitor.h"
12 12
13 #include "webrtc/base/checks.h"
13 #include "webrtc/base/common.h" 14 #include "webrtc/base/common.h"
14 15
15 namespace { 16 namespace {
16 const uint32_t UPDATE_NETWORKS_MESSAGE = 1; 17 const uint32_t UPDATE_NETWORKS_MESSAGE = 1;
17 18
18 // This is set by NetworkMonitorFactory::SetFactory and the caller of 19 // This is set by NetworkMonitorFactory::SetFactory and the caller of
19 // NetworkMonitorFactory::SetFactory must be responsible for calling 20 // NetworkMonitorFactory::SetFactory must be responsible for calling
20 // ReleaseFactory to destroy the factory. 21 // ReleaseFactory to destroy the factory.
21 rtc::NetworkMonitorFactory* network_monitor_factory = nullptr; 22 rtc::NetworkMonitorFactory* network_monitor_factory = nullptr;
22 } // namespace 23 } // namespace
23 24
24 namespace rtc { 25 namespace rtc {
25 NetworkMonitorInterface::NetworkMonitorInterface() {} 26 NetworkMonitorInterface::NetworkMonitorInterface() {}
26 27
27 NetworkMonitorInterface::~NetworkMonitorInterface() {} 28 NetworkMonitorInterface::~NetworkMonitorInterface() {}
28 29
29 NetworkMonitorBase::NetworkMonitorBase() : worker_thread_(Thread::Current()) {} 30 NetworkMonitorBase::NetworkMonitorBase() : worker_thread_(Thread::Current()) {}
30 NetworkMonitorBase::~NetworkMonitorBase() {} 31 NetworkMonitorBase::~NetworkMonitorBase() {}
31 32
32 void NetworkMonitorBase::OnNetworksChanged() { 33 void NetworkMonitorBase::OnNetworksChanged() {
33 LOG(LS_VERBOSE) << "Network change is received at the network monitor"; 34 LOG(LS_VERBOSE) << "Network change is received at the network monitor";
34 worker_thread_->Post(RTC_FROM_HERE, this, UPDATE_NETWORKS_MESSAGE); 35 worker_thread_->Post(RTC_FROM_HERE, this, UPDATE_NETWORKS_MESSAGE);
35 } 36 }
36 37
37 void NetworkMonitorBase::OnMessage(Message* msg) { 38 void NetworkMonitorBase::OnMessage(Message* msg) {
38 ASSERT(msg->message_id == UPDATE_NETWORKS_MESSAGE); 39 RTC_DCHECK(msg->message_id == UPDATE_NETWORKS_MESSAGE);
39 SignalNetworksChanged(); 40 SignalNetworksChanged();
40 } 41 }
41 42
42 NetworkMonitorFactory::NetworkMonitorFactory() {} 43 NetworkMonitorFactory::NetworkMonitorFactory() {}
43 NetworkMonitorFactory::~NetworkMonitorFactory() {} 44 NetworkMonitorFactory::~NetworkMonitorFactory() {}
44 45
45 void NetworkMonitorFactory::SetFactory(NetworkMonitorFactory* factory) { 46 void NetworkMonitorFactory::SetFactory(NetworkMonitorFactory* factory) {
46 if (network_monitor_factory != nullptr) { 47 if (network_monitor_factory != nullptr) {
47 delete network_monitor_factory; 48 delete network_monitor_factory;
48 } 49 }
49 network_monitor_factory = factory; 50 network_monitor_factory = factory;
50 } 51 }
51 52
52 void NetworkMonitorFactory::ReleaseFactory(NetworkMonitorFactory* factory) { 53 void NetworkMonitorFactory::ReleaseFactory(NetworkMonitorFactory* factory) {
53 if (factory == network_monitor_factory) { 54 if (factory == network_monitor_factory) {
54 SetFactory(nullptr); 55 SetFactory(nullptr);
55 } 56 }
56 } 57 }
57 58
58 NetworkMonitorFactory* NetworkMonitorFactory::GetFactory() { 59 NetworkMonitorFactory* NetworkMonitorFactory::GetFactory() {
59 return network_monitor_factory; 60 return network_monitor_factory;
60 } 61 }
61 62
62 } // namespace rtc 63 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/network.cc ('k') | webrtc/base/openssladapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698