From a21d07160700d50514f16683a45d138d005c67c8 Mon Sep 17 00:00:00 2001 From: "thorcarpenter@google.com" Date: Fri, 26 Sep 2014 17:19:14 +0000 Subject: [PATCH] Reverting part of https://webrtc-codereview.appspot.com/15089004/diff/140001/talk/session/media/channelmanager.cc?context=10&column_width=80 because of a major regression hanging the executable on start. R=jiayl@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22799004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7309 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/session/media/channelmanager.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc index 199bc8621d..45e7e4764a 100644 --- a/talk/session/media/channelmanager.cc +++ b/talk/session/media/channelmanager.cc @@ -137,12 +137,6 @@ void ChannelManager::Construct(MediaEngineInterface* me, this, &ChannelManager::OnVideoCaptureStateChange); capture_manager_->SignalCapturerStateChange.connect( this, &ChannelManager::OnVideoCaptureStateChange); - - if (worker_thread_ != rtc::Thread::Current()) { - // Do not allow invoking calls to other threads on the worker thread. - worker_thread_->Invoke( - rtc::Bind(&rtc::Thread::SetAllowBlockingCalls, worker_thread_, false)); - } } ChannelManager::~ChannelManager() {