Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: components/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc

Issue 1250613002: scheduler: Remove task observer shenanigans (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed a failing test. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
diff --git a/components/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc b/components/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
index 6999da7126311c8d0fbc860eae8088ecbb93e2fa..77173b06c36747e4bee15116b756e9e55e1c71a5 100644
--- a/components/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
+++ b/components/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
@@ -47,12 +47,6 @@ class WebThreadImplForRendererSchedulerTest : public testing::Test {
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_;
@@ -71,8 +65,6 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestTaskObserver) {
EXPECT_CALL(observer, willProcessTask());
EXPECT_CALL(*task, run());
EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
}
thread_.postTask(blink::WebTraceLocation(), task.release());
@@ -91,8 +83,6 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithOneTask) {
EXPECT_CALL(observer, willProcessTask());
EXPECT_CALL(*task, run());
EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
}
thread_.postTask(blink::WebTraceLocation(), task.release());
@@ -116,8 +106,6 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithTwoTasks) {
EXPECT_CALL(observer, willProcessTask());
EXPECT_CALL(*task2, run());
EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
}
thread_.postTask(blink::WebTraceLocation(), task1.release());
@@ -147,8 +135,6 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithThreeTasks) {
EXPECT_CALL(observer, willProcessTask());
EXPECT_CALL(*task3, run());
EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
}
thread_.postTask(blink::WebTraceLocation(), task1.release());
@@ -193,8 +179,6 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestNestedRunLoop) {
// A final callback for EnterRunLoop.
EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
}
message_loop_.task_runner()->PostTask(

Powered by Google App Engine
This is Rietveld 408576698