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

Unified Diff: third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc

Issue 2798563003: [scheduler] Add TaskQueue::Observer (Closed)
Patch Set: Rebased Created 3 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
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 bc62249beda9658f183af6c1c7075a71c18da989..0e6fc28ab59fbd0fda64c73d73e79b78acdef341 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_;
@@ -124,7 +122,7 @@ TEST_F(TimeDomainTest, ScheduleDelayedWorkSupersedesPreviousWakeUp) {
Mock::VerifyAndClearExpectations(time_domain_.get());
- // Now scheduler a later wake-up, which should replace the previously
+ // Now schedule a later wake_up, which should replace the previously
// requested one.
EXPECT_CALL(*time_domain_.get(), RequestWakeUpAt(_, delayed_runtime2));
time_domain_->ScheduleDelayedWork(task_queue_.get(), {delayed_runtime2, 0},
@@ -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

Powered by Google App Engine
This is Rietveld 408576698