generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove Thread::RunningForChannelManager().

Browse Source 
I haven't heard of this failing, so it should be safe to remove. Let me know if this isn't the case.

BUG=3388
R=andrew@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18659004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6695 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tkchin@webrtc.org 2014-07-15 17:52:43 +00:00
parent 89fd1e8e99
commit 42fe4350fe
4 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
talk/base/thread.h
View File

@ -235,11 +235,6 @@ class Thread : public MessageQueue {
// question to guarantee that the returned value remains true for the duration
// of whatever code is conditionally executing because of the return value!
bool RunningForTest() { return running(); }
// This is a legacy call-site that probably doesn't need to exist in the first
// place.
// TODO(fischman): delete once the ASSERT added in channelmanager.cc sticks
// for a month (ETA 2014/06/22).
bool RunningForChannelManager() { return running(); }
protected:
// Blocks the calling thread until this thread has terminated.

6
talk/session/media/channelmanager.cc
View File

@ -217,11 +217,7 @@ bool ChannelManager::Init() {
}
ASSERT(worker_thread_ != NULL);
ASSERT(worker_thread_->RunningForChannelManager());
// TODO(fischman): remove the if below (and
// Thread::RunningForChannelManager()) once the ASSERT above has stuck for a
// month (2014/06/22).
if (worker_thread_ && worker_thread_->RunningForChannelManager()) {
if (worker_thread_) {
if (media_engine_->Init(worker_thread_)) {
initialized_ = true;

9
talk/session/media/channelmanager_unittest.cc
View File

@ -121,15 +121,6 @@ TEST_F(ChannelManagerTest, StartupShutdownOnThread) {
EXPECT_FALSE(cm_->initialized());
}
// Test that we fail to startup if we're given an unstarted thread.
// TODO(fischman): delete once Thread::RunningForChannelManager() is gone
// (webrtc:3388).
TEST_F(ChannelManagerTest, DISABLED_StartupShutdownOnUnstartedThread) {
EXPECT_TRUE(cm_->set_worker_thread(&worker_));
EXPECT_FALSE(cm_->Init());
EXPECT_FALSE(cm_->initialized());
}
// Test that we can create and destroy a voice and video channel.
TEST_F(ChannelManagerTest, CreateDestroyChannels) {
EXPECT_TRUE(cm_->Init());

5
webrtc/base/thread.h
View File

@ -218,11 +218,6 @@ class Thread : public MessageQueue {
// question to guarantee that the returned value remains true for the duration
// of whatever code is conditionally executing because of the return value!
bool RunningForTest() { return running(); }
// This is a legacy call-site that probably doesn't need to exist in the first
// place.
// TODO(fischman): delete once the ASSERT added in channelmanager.cc sticks
// for a month (ETA 2014/06/22).
bool RunningForChannelManager() { return running(); }
protected:
// Blocks the calling thread until this thread has terminated.