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

Unified Diff: content/child/scheduler/task_queue_manager_unittest.cc

Issue 1098033002: Remove dependency on cc::TestNowSource from scheduler code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 5 years, 8 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
« no previous file with comments | « content/child/scheduler/task_queue_manager.cc ('k') | content/child/scheduler/time_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/scheduler/task_queue_manager_unittest.cc
diff --git a/content/child/scheduler/task_queue_manager_unittest.cc b/content/child/scheduler/task_queue_manager_unittest.cc
index 17a206b722685b75d5e036dcc32b7b2723abba10..5a57320045872310b8905106aee575a4112fc01d 100644
--- a/content/child/scheduler/task_queue_manager_unittest.cc
+++ b/content/child/scheduler/task_queue_manager_unittest.cc
@@ -10,6 +10,7 @@
#include "content/child/scheduler/nestable_task_runner_for_test.h"
#include "content/child/scheduler/scheduler_message_loop_delegate.h"
#include "content/child/scheduler/task_queue_selector.h"
+#include "content/test/test_time_source.h"
#include "testing/gmock/include/gmock/gmock.h"
using testing::ElementsAre;
@@ -123,7 +124,8 @@ class TaskQueueManagerTest : public testing::Test {
manager_ = make_scoped_ptr(new TaskQueueManager(
num_queues, NestableTaskRunnerForTest::Create(test_task_runner_.get()),
selector_.get(), "test.scheduler"));
- manager_->SetTimeSourceForTesting(now_src_);
+ manager_->SetTimeSourceForTesting(
+ make_scoped_ptr(new TestTimeSource(now_src_)));
EXPECT_EQ(num_queues, selector_->work_queues().size());
}
@@ -223,7 +225,8 @@ TEST_F(TaskQueueManagerTest, NowNotCalledWhenThereAreNoDelayedTasks) {
Initialize(3u, SelectorType::Explicit);
scoped_refptr<cc::TestNowSource> now_src = cc::TestNowSource::Create(1000);
- manager_->SetTimeSourceForTesting(now_src);
+ manager_->SetTimeSourceForTesting(
+ make_scoped_ptr(new TestTimeSource(now_src)));
scoped_refptr<base::SingleThreadTaskRunner> runners[3] = {
manager_->TaskRunnerForQueue(0),
@@ -987,7 +990,7 @@ TEST_F(TaskQueueManagerTest, ThreadCheckAfterTermination) {
TEST_F(TaskQueueManagerTest, NextPendingDelayedTaskRunTime) {
scoped_refptr<cc::TestNowSource> clock(cc::TestNowSource::Create());
Initialize(2u, SelectorType::Explicit);
- manager_->SetTimeSourceForTesting(clock);
+ manager_->SetTimeSourceForTesting(make_scoped_ptr(new TestTimeSource(clock)));
scoped_refptr<base::SingleThreadTaskRunner> runners[2] = {
manager_->TaskRunnerForQueue(0), manager_->TaskRunnerForQueue(1)};
« no previous file with comments | « content/child/scheduler/task_queue_manager.cc ('k') | content/child/scheduler/time_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698