| Index: cc/test/scheduler_test_common.h
|
| diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
|
| index f3c6f9c3d8af422e19e2ea9fbe616c214b23f250..df0d522a7a7c80dbe16d1a7a82e30a33e699b8e7 100644
|
| --- a/cc/test/scheduler_test_common.h
|
| +++ b/cc/test/scheduler_test_common.h
|
| @@ -40,23 +40,14 @@ class FakeDelayBasedTimeSourceClient : public DelayBasedTimeSourceClient {
|
|
|
| class FakeDelayBasedTimeSource : public DelayBasedTimeSource {
|
| public:
|
| - static std::unique_ptr<FakeDelayBasedTimeSource> Create(
|
| - base::TimeDelta interval,
|
| - base::SingleThreadTaskRunner* task_runner) {
|
| - return base::WrapUnique(
|
| - new FakeDelayBasedTimeSource(interval, task_runner));
|
| - }
|
| -
|
| + explicit FakeDelayBasedTimeSource(base::SingleThreadTaskRunner* task_runner)
|
| + : DelayBasedTimeSource(task_runner) {}
|
| ~FakeDelayBasedTimeSource() override {}
|
|
|
| void SetNow(base::TimeTicks time) { now_ = time; }
|
| base::TimeTicks Now() const override;
|
|
|
| protected:
|
| - FakeDelayBasedTimeSource(base::TimeDelta interval,
|
| - base::SingleThreadTaskRunner* task_runner)
|
| - : DelayBasedTimeSource(interval, task_runner) {}
|
| -
|
| base::TimeTicks now_;
|
|
|
| private:
|
| @@ -65,21 +56,11 @@ class FakeDelayBasedTimeSource : public DelayBasedTimeSource {
|
|
|
| class TestDelayBasedTimeSource : public DelayBasedTimeSource {
|
| public:
|
| - static std::unique_ptr<TestDelayBasedTimeSource> Create(
|
| - base::SimpleTestTickClock* now_src,
|
| - base::TimeDelta interval,
|
| - OrderedSimpleTaskRunner* task_runner) {
|
| - return base::WrapUnique(
|
| - new TestDelayBasedTimeSource(now_src, interval, task_runner));
|
| - }
|
| -
|
| - ~TestDelayBasedTimeSource() override;
|
| -
|
| - protected:
|
| TestDelayBasedTimeSource(base::SimpleTestTickClock* now_src,
|
| - base::TimeDelta interval,
|
| OrderedSimpleTaskRunner* task_runner);
|
| + ~TestDelayBasedTimeSource() override;
|
|
|
| + protected:
|
| // Overridden from DelayBasedTimeSource
|
| base::TimeTicks Now() const override;
|
| std::string TypeString() const override;
|
| @@ -115,32 +96,6 @@ class FakeBeginFrameSource : public BeginFrameSourceBase {
|
| DISALLOW_COPY_AND_ASSIGN(FakeBeginFrameSource);
|
| };
|
|
|
| -class TestBackToBackBeginFrameSource : public BackToBackBeginFrameSource {
|
| - public:
|
| - TestBackToBackBeginFrameSource(base::SimpleTestTickClock* now_src,
|
| - base::SingleThreadTaskRunner* task_runner);
|
| - ~TestBackToBackBeginFrameSource() override;
|
| -
|
| - protected:
|
| - base::TimeTicks Now() override;
|
| - // Not owned.
|
| - base::SimpleTestTickClock* now_src_;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(TestBackToBackBeginFrameSource);
|
| -};
|
| -
|
| -class TestSyntheticBeginFrameSource : public SyntheticBeginFrameSource {
|
| - public:
|
| - explicit TestSyntheticBeginFrameSource(base::SimpleTestTickClock* now_src,
|
| - OrderedSimpleTaskRunner* task_runner,
|
| - base::TimeDelta initial_interval);
|
| - ~TestSyntheticBeginFrameSource() override;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(TestSyntheticBeginFrameSource);
|
| -};
|
| -
|
| class FakeCompositorTimingHistory : public CompositorTimingHistory {
|
| public:
|
| static std::unique_ptr<FakeCompositorTimingHistory> Create(
|
|
|