| Index: webrtc/base/signalthread.cc
|
| diff --git a/webrtc/base/signalthread.cc b/webrtc/base/signalthread.cc
|
| index 1934e2b89d0a099d0bcb3262597bcb143dbbb409..6e0bd14ebba60d6615ec26cd119b4b44694681a0 100644
|
| --- a/webrtc/base/signalthread.cc
|
| +++ b/webrtc/base/signalthread.cc
|
| @@ -30,19 +30,19 @@ SignalThread::SignalThread(bool use_socket_server)
|
| }
|
|
|
| SignalThread::~SignalThread() {
|
| - ASSERT(refcount_ == 0);
|
| + RTC_DCHECK(refcount_ == 0);
|
| }
|
|
|
| bool SignalThread::SetName(const std::string& name, const void* obj) {
|
| EnterExit ee(this);
|
| - ASSERT(main_->IsCurrent());
|
| - ASSERT(kInit == state_);
|
| + RTC_DCHECK(main_->IsCurrent());
|
| + RTC_DCHECK(kInit == state_);
|
| return worker_.SetName(name, obj);
|
| }
|
|
|
| void SignalThread::Start() {
|
| EnterExit ee(this);
|
| - ASSERT(main_->IsCurrent());
|
| + RTC_DCHECK(main_->IsCurrent());
|
| if (kInit == state_ || kComplete == state_) {
|
| state_ = kRunning;
|
| OnWorkStart();
|
| @@ -54,7 +54,7 @@ void SignalThread::Start() {
|
|
|
| void SignalThread::Destroy(bool wait) {
|
| EnterExit ee(this);
|
| - ASSERT(main_->IsCurrent());
|
| + RTC_DCHECK(main_->IsCurrent());
|
| if ((kInit == state_) || (kComplete == state_)) {
|
| refcount_--;
|
| } else if (kRunning == state_ || kReleasing == state_) {
|
| @@ -77,7 +77,7 @@ void SignalThread::Destroy(bool wait) {
|
|
|
| void SignalThread::Release() {
|
| EnterExit ee(this);
|
| - ASSERT(main_->IsCurrent());
|
| + RTC_DCHECK(main_->IsCurrent());
|
| if (kComplete == state_) {
|
| refcount_--;
|
| } else if (kRunning == state_) {
|
| @@ -90,14 +90,14 @@ void SignalThread::Release() {
|
|
|
| bool SignalThread::ContinueWork() {
|
| EnterExit ee(this);
|
| - ASSERT(worker_.IsCurrent());
|
| + RTC_DCHECK(worker_.IsCurrent());
|
| return worker_.ProcessMessages(0);
|
| }
|
|
|
| void SignalThread::OnMessage(Message *msg) {
|
| EnterExit ee(this);
|
| if (ST_MSG_WORKER_DONE == msg->message_id) {
|
| - ASSERT(main_->IsCurrent());
|
| + RTC_DCHECK(main_->IsCurrent());
|
| OnWorkDone();
|
| bool do_delete = false;
|
| if (kRunning == state_) {
|
|
|