Add thread check to ModuleProcessThread::DeRegisterModule

webrtc/voice_engine/channel_manager.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 88 matching lines @@
 
       if (channel->ChannelId() == channel_id) {
         to_delete = it;
       }
     }
     if (to_delete != channels_.end()) {
       reference = *to_delete;
       channels_.erase(to_delete);
     }
   }
+  if (reference.channel()) {
+    // Ensure the channel is torn down now, on this thread, since a reference
+    // may still be held on a different thread (e.g. in the audio capture
+    // thread).
+    reference.channel()->Terminate();
+  }
 }
 
 void ChannelManager::DestroyAllChannels() {
   // Holds references so that Channels are not destroyed while holding this
   // lock, but rather when the method returns.
   std::vector<ChannelOwner> references;
   {
     rtc::CritScope crit(&lock_);
     references = channels_;
     channels_.clear();
   }
+  for (auto& owner : references) {
+    if (owner.channel())
+      owner.channel()->Terminate();
+  }
 }
 
 size_t ChannelManager::NumOfChannels() const {
   rtc::CritScope crit(&lock_);
   return channels_.size();
 }
 
 ChannelManager::Iterator::Iterator(ChannelManager* channel_manager)
     : iterator_pos_(0) {
   channel_manager->GetAllChannels(&channels_);
 }
 
 Channel* ChannelManager::Iterator::GetChannel() {
   if (iterator_pos_ < channels_.size())
     return channels_[iterator_pos_].channel();
   return NULL;
 }
 
 bool ChannelManager::Iterator::IsValid() {
   return iterator_pos_ < channels_.size();
 }
 
 void ChannelManager::Iterator::Increment() {
   ++iterator_pos_;
 }
 
 }  // namespace voe
 }  // namespace webrtc