Showing alternative approach to fixing TaskQueue deadlock.

webrtc/base/task_queue_unittest.cc

Index: webrtc/base/task_queue_unittest.cc
diff --git a/webrtc/base/task_queue_unittest.cc b/webrtc/base/task_queue_unittest.cc
index 74433b91440117250fc72cc959326db0afa2f935..703dc408d8a4fefb43ce7ac972215818c57cb82b 100644
--- a/webrtc/base/task_queue_unittest.cc
+++ b/webrtc/base/task_queue_unittest.cc
@@ -37,22 +37,21 @@ TEST(TaskQueueTest, Construct) {
 
 TEST(TaskQueueTest, PostAndCheckCurrent) {
   static const char kQueueName[] = "PostAndCheckCurrent";
+  Event event(false, false);
   TaskQueue queue(kQueueName);
 
   // We're not running a task, so there shouldn't be a current queue.
   EXPECT_FALSE(queue.IsCurrent());
   EXPECT_FALSE(TaskQueue::Current());
 
-  Event event(false, false);
   queue.PostTask(Bind(&CheckCurrent, kQueueName, &event, &queue));
   EXPECT_TRUE(event.Wait(1000));
 }
 
 TEST(TaskQueueTest, PostCustomTask) {
   static const char kQueueName[] = "PostCustomImplementation";
-  TaskQueue queue(kQueueName);
-
   Event event(false, false);
+  TaskQueue queue(kQueueName);
 
   class CustomTask : public QueuedTask {
    public:
@@ -74,18 +73,18 @@ TEST(TaskQueueTest, PostCustomTask) {
 
 TEST(TaskQueueTest, PostLambda) {
   static const char kQueueName[] = "PostLambda";
+  Event event(false, false);
   TaskQueue queue(kQueueName);
 
-  Event event(false, false);
   queue.PostTask([&event]() { event.Set(); });
   EXPECT_TRUE(event.Wait(1000));
 }
 
 TEST(TaskQueueTest, PostFromQueue) {
   static const char kQueueName[] = "PostFromQueue";
+  Event event(false, false);
   TaskQueue queue(kQueueName);
 
-  Event event(false, false);
   queue.PostTask(
       [&event, &queue]() { queue.PostTask([&event]() { event.Set(); }); });
   EXPECT_TRUE(event.Wait(1000));
@@ -93,9 +92,9 @@ TEST(TaskQueueTest, PostFromQueue) {
 
 TEST(TaskQueueTest, PostDelayed) {
   static const char kQueueName[] = "PostDelayed";
+  Event event(false, false);
   TaskQueue queue(kQueueName);
 
-  Event event(false, false);
   uint32_t start = Time();
   queue.PostDelayedTask(Bind(&CheckCurrent, kQueueName, &event, &queue), 100);
   EXPECT_TRUE(event.Wait(1000));
@@ -109,9 +108,9 @@ TEST(TaskQueueTest, PostDelayed) {
 
 TEST(TaskQueueTest, PostMultipleDelayed) {
   static const char kQueueName[] = "PostMultipleDelayed";
+  std::vector<std::unique_ptr<Event>> events;
   TaskQueue queue(kQueueName);
 
-  std::vector<std::unique_ptr<Event>> events;
   for (int i = 0; i < 100; ++i) {
     events.push_back(std::unique_ptr<Event>(new Event(false, false)));
     queue.PostDelayedTask(
@@ -135,14 +134,13 @@ TEST(TaskQueueTest, PostDelayedAfterDestruct) {
 TEST(TaskQueueTest, PostAndReply) {
   static const char kPostQueue[] = "PostQueue";
   static const char kReplyQueue[] = "ReplyQueue";
+  Event event(false, false);
   TaskQueue post_queue(kPostQueue);
   TaskQueue reply_queue(kReplyQueue);
 
-  Event event(false, false);
   post_queue.PostTaskAndReply(
       Bind(&CheckCurrent, kPostQueue, nullptr, &post_queue),
       Bind(&CheckCurrent, kReplyQueue, &event, &reply_queue), &reply_queue);
-  EXPECT_TRUE(event.Wait(1000));
 }
 
 TEST(TaskQueueTest, PostAndReuse) {
@@ -195,10 +193,10 @@ TEST(TaskQueueTest, PostAndReuse) {
 TEST(TaskQueueTest, PostAndReplyLambda) {
   static const char kPostQueue[] = "PostQueue";
   static const char kReplyQueue[] = "ReplyQueue";
+  Event event(false, false);
   TaskQueue post_queue(kPostQueue);
   TaskQueue reply_queue(kReplyQueue);
 
-  Event event(false, false);
   bool my_flag = false;
   post_queue.PostTaskAndReply([&my_flag]() { my_flag = true; },
                               [&event]() { event.Set(); }, &reply_queue);
@@ -220,10 +218,10 @@ void TestPostTaskAndReply(TaskQueue* work_queue,
 TEST(TaskQueueTest, PostAndReply2) {
   static const char kQueueName[] = "PostAndReply2";
   static const char kWorkQueueName[] = "PostAndReply2_Worker";
+  Event event(false, false);
   TaskQueue queue(kQueueName);
   TaskQueue work_queue(kWorkQueueName);
 
-  Event event(false, false);
   queue.PostTask(
       Bind(&TestPostTaskAndReply, &work_queue, kWorkQueueName, &event));
   EXPECT_TRUE(event.Wait(1000));