Remove after wakeup logic and replace PumpTask with Fences

third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/scheduler/child/scheduler_helper.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/simple_test_tick_clock.h"
@@ skipping 153 matching lines @@
   scheduler_helper_->AddTaskObserver(&observer);
 
   scheduler_helper_->ControlTaskRunner()->PostTask(FROM_HERE,
                                                    base::Bind(&NopTask));
 
   EXPECT_CALL(observer, WillProcessTask(_)).Times(0);
   EXPECT_CALL(observer, DidProcessTask(_)).Times(0);
   RunUntilIdle();
 }
 
-TEST_F(SchedulerHelperTest,
-       ObserversNotNotifiedFor_ControlAfterWakeUpTaskRunner) {
-  MockTaskObserver observer;
-  scheduler_helper_->AddTaskObserver(&observer);
-
-  scheduler_helper_->ControlAfterWakeUpTaskRunner()->PostTask(
-      FROM_HERE, base::Bind(&NopTask));
-
-  EXPECT_CALL(observer, WillProcessTask(_)).Times(0);
-  EXPECT_CALL(observer, DidProcessTask(_)).Times(0);
-  LazyNow lazy_now(clock_.get());
-  scheduler_helper_->ControlAfterWakeUpTaskRunner()->PumpQueue(&lazy_now, true);
-  RunUntilIdle();
-}
-
 namespace {
 
 class MockObserver : public SchedulerHelper::Observer {
  public:
   MOCK_METHOD1(OnUnregisterTaskQueue,
                void(const scoped_refptr<TaskQueue>& queue));
   MOCK_METHOD2(OnTriedToExecuteBlockedTask,
                void(const TaskQueue& queue, const base::PendingTask& task));
 };
 
@@ skipping 14 matching lines @@
 
 TEST_F(SchedulerHelperTest, OnTriedToExecuteBlockedTask) {
   MockObserver observer;
   scheduler_helper_->SetObserver(&observer);
 
   scoped_refptr<TaskQueue> task_queue = scheduler_helper_->NewTaskQueue(
       TaskQueue::Spec("test_queue").SetShouldReportWhenExecutionBlocked(true));
   task_queue->SetQueueEnabled(false);
   task_queue->PostTask(FROM_HERE, base::Bind(&NopTask));
 
+  // Trick |task_queue| into posting a DoWork. By default PostTask with a
+  // disabled queue won't post a DoWork until we enable the queue.
+  task_queue->SetQueueEnabled(true);
+  task_queue->SetQueueEnabled(false);
+
   EXPECT_CALL(observer, OnTriedToExecuteBlockedTask(_, _)).Times(1);
   RunUntilIdle();
 
   scheduler_helper_->SetObserver(nullptr);
 }
 
 }  // namespace scheduler
 }  // namespace blink