scheduler: Remove task observer shenanigans

components/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc

 // Copyright 2015 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 "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
 
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "components/scheduler/child/scheduler_task_runner_delegate_impl.h"
@@ skipping 29 matching lines @@
   ~WebThreadImplForRendererSchedulerTest() override {}
 
   void SetWorkBatchSizeForTesting(size_t work_batch_size) {
     scheduler_.GetSchedulerHelperForTesting()->SetWorkBatchSizeForTesting(
         work_batch_size);
   }
 
   void TearDown() override { scheduler_.Shutdown(); }
 
  protected:
-  void EatDefaultTask(MockTaskObserver* observer) {
-    // The scheduler posts one extra DoWork() task automatically.
-    EXPECT_CALL(*observer, willProcessTask());
-    EXPECT_CALL(*observer, didProcessTask());
-  }
-
   base::MessageLoop message_loop_;
   RendererSchedulerImpl scheduler_;
   scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
   WebThreadImplForRendererScheduler thread_;
 
   DISALLOW_COPY_AND_ASSIGN(WebThreadImplForRendererSchedulerTest);
 };
 
 TEST_F(WebThreadImplForRendererSchedulerTest, TestTaskObserver) {
   MockTaskObserver observer;
   thread_.addTaskObserver(&observer);
   scoped_ptr<MockTask> task(new MockTask());
 
   {
     testing::InSequence sequence;
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(*task, run());
     EXPECT_CALL(observer, didProcessTask());
-
-    EatDefaultTask(&observer);
   }
 
   thread_.postTask(blink::WebTraceLocation(), task.release());
   message_loop_.RunUntilIdle();
   thread_.removeTaskObserver(&observer);
 }
 
 TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithOneTask) {
   MockTaskObserver observer;
   thread_.addTaskObserver(&observer);
   scoped_ptr<MockTask> task(new MockTask());
 
   SetWorkBatchSizeForTesting(kWorkBatchSize);
   {
     testing::InSequence sequence;
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(*task, run());
     EXPECT_CALL(observer, didProcessTask());
-
-    EatDefaultTask(&observer);
   }
 
   thread_.postTask(blink::WebTraceLocation(), task.release());
   message_loop_.RunUntilIdle();
   thread_.removeTaskObserver(&observer);
 }
 
 TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithTwoTasks) {
   MockTaskObserver observer;
   thread_.addTaskObserver(&observer);
   scoped_ptr<MockTask> task1(new MockTask());
   scoped_ptr<MockTask> task2(new MockTask());
 
   SetWorkBatchSizeForTesting(kWorkBatchSize);
   {
     testing::InSequence sequence;
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(*task1, run());
     EXPECT_CALL(observer, didProcessTask());
 
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(*task2, run());
     EXPECT_CALL(observer, didProcessTask());
-
-    EatDefaultTask(&observer);
   }
 
   thread_.postTask(blink::WebTraceLocation(), task1.release());
   thread_.postTask(blink::WebTraceLocation(), task2.release());
   message_loop_.RunUntilIdle();
   thread_.removeTaskObserver(&observer);
 }
 
 TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithThreeTasks) {
   MockTaskObserver observer;
   thread_.addTaskObserver(&observer);
   scoped_ptr<MockTask> task1(new MockTask());
   scoped_ptr<MockTask> task2(new MockTask());
   scoped_ptr<MockTask> task3(new MockTask());
 
   SetWorkBatchSizeForTesting(kWorkBatchSize);
   {
     testing::InSequence sequence;
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(*task1, run());
     EXPECT_CALL(observer, didProcessTask());
 
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(*task2, run());
     EXPECT_CALL(observer, didProcessTask());
 
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(*task3, run());
     EXPECT_CALL(observer, didProcessTask());
-
-    EatDefaultTask(&observer);
   }
 
   thread_.postTask(blink::WebTraceLocation(), task1.release());
   thread_.postTask(blink::WebTraceLocation(), task2.release());
   thread_.postTask(blink::WebTraceLocation(), task3.release());
   message_loop_.RunUntilIdle();
   thread_.removeTaskObserver(&observer);
 }
 
 class ExitRunLoopTask : public blink::WebThread::Task {
@@ skipping 24 matching lines @@
 
     // One callback for EnterRunLoop.
     EXPECT_CALL(observer, willProcessTask());
 
     // A pair for ExitRunLoopTask.
     EXPECT_CALL(observer, willProcessTask());
     EXPECT_CALL(observer, didProcessTask());
 
     // A final callback for EnterRunLoop.
     EXPECT_CALL(observer, didProcessTask());
-
-    EatDefaultTask(&observer);
   }
 
   message_loop_.task_runner()->PostTask(
       FROM_HERE, base::Bind(&EnterRunLoop, base::Unretained(&message_loop_),
                             base::Unretained(&thread_)));
   message_loop_.RunUntilIdle();
   thread_.removeTaskObserver(&observer);
 }
 
 }  // namespace scheduler