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

Side by Side Diff: third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_unittest.cc

Issue 2276353002: Remove after wakeup logic and replace PumpTask with Fences (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Slight simplification Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/scheduler/child/scheduler_helper.h" 5 #include "platform/scheduler/child/scheduler_helper.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/test/simple_test_tick_clock.h" 10 #include "base/test/simple_test_tick_clock.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 scheduler_helper_->AddTaskObserver(&observer); 164 scheduler_helper_->AddTaskObserver(&observer);
165 165
166 scheduler_helper_->ControlTaskRunner()->PostTask(FROM_HERE, 166 scheduler_helper_->ControlTaskRunner()->PostTask(FROM_HERE,
167 base::Bind(&NopTask)); 167 base::Bind(&NopTask));
168 168
169 EXPECT_CALL(observer, WillProcessTask(_)).Times(0); 169 EXPECT_CALL(observer, WillProcessTask(_)).Times(0);
170 EXPECT_CALL(observer, DidProcessTask(_)).Times(0); 170 EXPECT_CALL(observer, DidProcessTask(_)).Times(0);
171 RunUntilIdle(); 171 RunUntilIdle();
172 } 172 }
173 173
174 TEST_F(SchedulerHelperTest,
175 ObserversNotNotifiedFor_ControlAfterWakeUpTaskRunner) {
176 MockTaskObserver observer;
177 scheduler_helper_->AddTaskObserver(&observer);
178
179 scheduler_helper_->ControlAfterWakeUpTaskRunner()->PostTask(
180 FROM_HERE, base::Bind(&NopTask));
181
182 EXPECT_CALL(observer, WillProcessTask(_)).Times(0);
183 EXPECT_CALL(observer, DidProcessTask(_)).Times(0);
184 LazyNow lazy_now(clock_.get());
185 scheduler_helper_->ControlAfterWakeUpTaskRunner()->PumpQueue(&lazy_now, true);
186 RunUntilIdle();
187 }
188
189 namespace { 174 namespace {
190 175
191 class MockObserver : public SchedulerHelper::Observer { 176 class MockObserver : public SchedulerHelper::Observer {
192 public: 177 public:
193 MOCK_METHOD1(OnUnregisterTaskQueue, 178 MOCK_METHOD1(OnUnregisterTaskQueue,
194 void(const scoped_refptr<TaskQueue>& queue)); 179 void(const scoped_refptr<TaskQueue>& queue));
195 MOCK_METHOD2(OnTriedToExecuteBlockedTask, 180 MOCK_METHOD2(OnTriedToExecuteBlockedTask,
196 void(const TaskQueue& queue, const base::PendingTask& task)); 181 void(const TaskQueue& queue, const base::PendingTask& task));
197 }; 182 };
198 183
(...skipping 14 matching lines...) Expand all
213 198
214 TEST_F(SchedulerHelperTest, OnTriedToExecuteBlockedTask) { 199 TEST_F(SchedulerHelperTest, OnTriedToExecuteBlockedTask) {
215 MockObserver observer; 200 MockObserver observer;
216 scheduler_helper_->SetObserver(&observer); 201 scheduler_helper_->SetObserver(&observer);
217 202
218 scoped_refptr<TaskQueue> task_queue = scheduler_helper_->NewTaskQueue( 203 scoped_refptr<TaskQueue> task_queue = scheduler_helper_->NewTaskQueue(
219 TaskQueue::Spec("test_queue").SetShouldReportWhenExecutionBlocked(true)); 204 TaskQueue::Spec("test_queue").SetShouldReportWhenExecutionBlocked(true));
220 task_queue->SetQueueEnabled(false); 205 task_queue->SetQueueEnabled(false);
221 task_queue->PostTask(FROM_HERE, base::Bind(&NopTask)); 206 task_queue->PostTask(FROM_HERE, base::Bind(&NopTask));
222 207
208 // Trick |task_queue| into posting a DoWork. By default PostTask with a
209 // disabled queue won't post a DoWork until we enable the queue.
210 task_queue->SetQueueEnabled(true);
211 task_queue->SetQueueEnabled(false);
212
223 EXPECT_CALL(observer, OnTriedToExecuteBlockedTask(_, _)).Times(1); 213 EXPECT_CALL(observer, OnTriedToExecuteBlockedTask(_, _)).Times(1);
224 RunUntilIdle(); 214 RunUntilIdle();
225 215
226 scheduler_helper_->SetObserver(nullptr); 216 scheduler_helper_->SetObserver(nullptr);
227 } 217 }
228 218
229 } // namespace scheduler 219 } // namespace scheduler
230 } // namespace blink 220 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698