Update talk to 51960985.

R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4696 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org
2013-09-06 22:56:28 +00:00
parent b159c2e3dd
commit 1b15f4226f
16 changed files with 198 additions and 198 deletions

View File

@@ -130,7 +130,25 @@ TEST_F(MessageQueueTest, DiposeHandlerWithPostedMessagePending) {
EXPECT_TRUE(deleted);
}
TEST(MessageQueueManager, DISABLED_Clear) {
struct UnwrapMainThreadScope {
UnwrapMainThreadScope() : rewrap_(Thread::Current() != NULL) {
if (rewrap_) ThreadManager::Instance()->UnwrapCurrentThread();
}
~UnwrapMainThreadScope() {
if (rewrap_) ThreadManager::Instance()->WrapCurrentThread();
}
private:
bool rewrap_;
};
TEST(MessageQueueManager, Clear) {
UnwrapMainThreadScope s;
if (MessageQueueManager::IsInitialized()) {
LOG(LS_INFO) << "Unable to run MessageQueueManager::Clear test, since the "
<< "MessageQueueManager was already initialized by some "
<< "other test in this run.";
return;
}
bool deleted = false;
DeletedMessageHandler* handler = new DeletedMessageHandler(&deleted);
delete handler;