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

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

Issue 987193002: Redirect the MessageLoop's task runner to the renderer scheduler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. 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/child/task_queue_manager_unittest.cc
diff --git a/components/scheduler/child/task_queue_manager_unittest.cc b/components/scheduler/child/task_queue_manager_unittest.cc
index 8b6839b20c0052e305944ec3dae313da18055b27..b8e6df84e67ee5cb23cedb887d85bec188a33a54 100644
--- a/components/scheduler/child/task_queue_manager_unittest.cc
+++ b/components/scheduler/child/task_queue_manager_unittest.cc
@@ -10,7 +10,7 @@
#include "base/threading/thread.h"
#include "cc/test/ordered_simple_task_runner.h"
#include "components/scheduler/child/nestable_task_runner_for_test.h"
-#include "components/scheduler/child/scheduler_message_loop_delegate.h"
+#include "components/scheduler/child/scheduler_task_runner_delegate_impl.h"
#include "components/scheduler/child/task_queue.h"
#include "components/scheduler/child/task_queue_selector.h"
#include "components/scheduler/child/test_time_source.h"
@@ -134,10 +134,12 @@ class TaskQueueManagerTest : public testing::Test {
now_src_->Advance(base::TimeDelta::FromMicroseconds(1000));
test_task_runner_ = make_scoped_refptr(
new cc::OrderedSimpleTaskRunner(now_src_.get(), false));
+ main_task_runner_ =
+ NestableTaskRunnerForTest::Create(test_task_runner_.get());
selector_ = make_scoped_ptr(createSelectorForTest(type));
- manager_ = make_scoped_ptr(new TaskQueueManager(
- num_queues, NestableTaskRunnerForTest::Create(test_task_runner_.get()),
- selector_.get(), "test.scheduler", "test.scheduler.debug"));
+ manager_ = make_scoped_ptr(
+ new TaskQueueManager(num_queues, main_task_runner_, selector_.get(),
+ "test.scheduler", "test.scheduler.debug"));
manager_->SetTimeSourceForTesting(
make_scoped_ptr(new TestTimeSource(now_src_.get())));
@@ -148,7 +150,8 @@ class TaskQueueManagerTest : public testing::Test {
message_loop_.reset(new base::MessageLoop());
selector_ = make_scoped_ptr(createSelectorForTest(type));
manager_ = make_scoped_ptr(new TaskQueueManager(
- num_queues, SchedulerMessageLoopDelegate::Create(message_loop_.get()),
+ num_queues,
+ SchedulerTaskRunnerDelegateImpl::Create(message_loop_.get()),
selector_.get(), "test.scheduler", "test.scheduler.debug"));
EXPECT_EQ(num_queues, selector_->work_queues().size());
}
@@ -189,11 +192,12 @@ class TaskQueueManagerTest : public testing::Test {
&TaskQueueManager::WakeupPolicyToString);
}
+ scoped_ptr<base::MessageLoop> message_loop_;
scoped_ptr<base::SimpleTestTickClock> now_src_;
+ scoped_refptr<NestableTaskRunnerForTest> main_task_runner_;
scoped_refptr<cc::OrderedSimpleTaskRunner> test_task_runner_;
scoped_ptr<SelectorForTest> selector_;
scoped_ptr<TaskQueueManager> manager_;
- scoped_ptr<base::MessageLoop> message_loop_;
};
void PostFromNestedRunloop(base::MessageLoop* message_loop,

Powered by Google App Engine
This is Rietveld 408576698