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

Unified Diff: cc/test/scheduler_test_common.h

Issue 554973002: Disable scheduler deadline task on battery power in Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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 | « cc/scheduler/scheduler_unittest.cc ('k') | cc/test/scheduler_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/scheduler_test_common.h
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 2cb878acf5f66642da5ed34eadce0056968242a5..a91fd01b9b4c37c7bee795138677374027ac0287 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -161,19 +161,17 @@ class TestScheduler : public Scheduler {
scoped_refptr<TestNowSource> now_src,
SchedulerClient* client,
const SchedulerSettings& scheduler_settings,
- int layer_tree_host_id) {
- // A bunch of tests require Now() to be > BeginFrameArgs::DefaultInterval()
- now_src->AdvanceNow(base::TimeDelta::FromMilliseconds(100));
-
- scoped_refptr<OrderedSimpleTaskRunner> test_task_runner =
- new OrderedSimpleTaskRunner(now_src, true);
+ int layer_tree_host_id,
+ const scoped_refptr<OrderedSimpleTaskRunner>& task_runner,
+ base::PowerMonitor* power_monitor) {
TestSchedulerFrameSourcesConstructor frame_sources_constructor(
- test_task_runner.get(), now_src.get());
+ task_runner.get(), now_src.get());
return make_scoped_ptr(new TestScheduler(now_src,
client,
scheduler_settings,
layer_tree_host_id,
- test_task_runner,
+ task_runner,
+ power_monitor,
&frame_sources_constructor));
}
@@ -183,7 +181,6 @@ class TestScheduler : public Scheduler {
}
BeginFrameSource& frame_source() { return *frame_source_; }
- OrderedSimpleTaskRunner& task_runner() { return *test_task_runner_; }
virtual ~TestScheduler();
@@ -198,10 +195,10 @@ class TestScheduler : public Scheduler {
const SchedulerSettings& scheduler_settings,
int layer_tree_host_id,
const scoped_refptr<OrderedSimpleTaskRunner>& test_task_runner,
+ base::PowerMonitor* power_monitor,
TestSchedulerFrameSourcesConstructor* frame_sources_constructor);
scoped_refptr<TestNowSource> now_src_;
- OrderedSimpleTaskRunner* test_task_runner_;
};
} // namespace cc
« no previous file with comments | « cc/scheduler/scheduler_unittest.cc ('k') | cc/test/scheduler_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698