| Index: third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc
|
| diff --git a/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc
|
| index 1c47328ee3da2aae8f1fdf7ae01d81c1de47b342..378d7906118af98063ffa5e882d0815f695c1ab8 100644
|
| --- a/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc
|
| @@ -24,16 +24,14 @@ namespace scheduler {
|
|
|
| class MockTimeDomain : public TimeDomain {
|
| public:
|
| - explicit MockTimeDomain(TimeDomain::Observer* observer)
|
| - : TimeDomain(observer),
|
| - now_(base::TimeTicks() + base::TimeDelta::FromSeconds(1)) {}
|
| + MockTimeDomain()
|
| + : now_(base::TimeTicks() + base::TimeDelta::FromSeconds(1)) {}
|
|
|
| ~MockTimeDomain() override {}
|
|
|
| using TimeDomain::CancelDelayedWork;
|
| using TimeDomain::NextScheduledRunTime;
|
| using TimeDomain::NextScheduledTaskQueue;
|
| - using TimeDomain::OnQueueHasImmediateWork;
|
| using TimeDomain::ScheduleDelayedWork;
|
| using TimeDomain::UnregisterQueue;
|
| using TimeDomain::WakeupReadyDelayedQueues;
|
| @@ -82,7 +80,7 @@ class TimeDomainTest : public testing::Test {
|
| }
|
|
|
| virtual MockTimeDomain* CreateMockTimeDomain() {
|
| - return new MockTimeDomain(nullptr);
|
| + return new MockTimeDomain();
|
| }
|
|
|
| std::unique_ptr<MockTimeDomain> time_domain_;
|
| @@ -330,38 +328,5 @@ TEST_F(TimeDomainTest, CancelDelayedWork_TwoQueues) {
|
| task_queue2->UnregisterTaskQueue();
|
| }
|
|
|
| -namespace {
|
| -class MockObserver : public TimeDomain::Observer {
|
| - public:
|
| - ~MockObserver() override {}
|
| -
|
| - MOCK_METHOD1(OnTimeDomainHasImmediateWork, void(TaskQueue*));
|
| - MOCK_METHOD1(OnTimeDomainHasDelayedWork, void(TaskQueue*));
|
| -};
|
| -} // namespace
|
| -
|
| -class TimeDomainWithObserverTest : public TimeDomainTest {
|
| - public:
|
| - MockTimeDomain* CreateMockTimeDomain() override {
|
| - observer_.reset(new MockObserver());
|
| - return new MockTimeDomain(observer_.get());
|
| - }
|
| -
|
| - std::unique_ptr<MockObserver> observer_;
|
| -};
|
| -
|
| -TEST_F(TimeDomainWithObserverTest, OnTimeDomainHasImmediateWork) {
|
| - EXPECT_CALL(*observer_, OnTimeDomainHasImmediateWork(task_queue_.get()));
|
| - time_domain_->OnQueueHasImmediateWork(task_queue_.get());
|
| -}
|
| -
|
| -TEST_F(TimeDomainWithObserverTest, OnTimeDomainHasDelayedWork) {
|
| - EXPECT_CALL(*observer_, OnTimeDomainHasDelayedWork(task_queue_.get()));
|
| - EXPECT_CALL(*time_domain_.get(), RequestWakeupAt(_, _));
|
| - base::TimeTicks now = time_domain_->Now();
|
| - time_domain_->ScheduleDelayedWork(
|
| - task_queue_.get(), {now + base::TimeDelta::FromMilliseconds(10), 0}, now);
|
| -}
|
| -
|
| } // namespace scheduler
|
| } // namespace blink
|
|
|