Revert of Scheduler refactoring to virtually elimate redundant DoWorks

third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/scheduler/base/time_domain.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "cc/test/ordered_simple_task_runner.h"
@@ skipping 16 matching lines @@
   explicit MockTimeDomain(TimeDomain::Observer* observer)
       : TimeDomain(observer),
         now_(base::TimeTicks() + base::TimeDelta::FromSeconds(1)) {}
 
   ~MockTimeDomain() override {}
 
   using TimeDomain::NextScheduledRunTime;
   using TimeDomain::NextScheduledTaskQueue;
   using TimeDomain::ScheduleDelayedWork;
   using TimeDomain::UnregisterQueue;
-  using TimeDomain::OnQueueHasImmediateWork;
-  using TimeDomain::WakeupReadyDelayedQueues;
+  using TimeDomain::UpdateWorkQueues;
+  using TimeDomain::RegisterAsUpdatableTaskQueue;
 
   // TimeSource implementation:
   LazyNow CreateLazyNow() const override { return LazyNow(now_); }
   base::TimeTicks Now() const override { return now_; }
 
   void AsValueIntoInternal(
       base::trace_event::TracedValue* state) const override {}
 
-  base::Optional<base::TimeDelta> DelayTillNextTask(
-      LazyNow* lazy_now) override {
-    return base::Optional<base::TimeDelta>();
-  }
+  bool MaybeAdvanceTime() override { return false; }
   const char* GetName() const override { return "Test"; }
   void OnRegisterWithTaskQueueManager(
       TaskQueueManager* task_queue_manager) override {}
 
   MOCK_METHOD2(RequestWakeup, void(base::TimeTicks now, base::TimeDelta delay));
 
   void SetNow(base::TimeTicks now) { now_ = now; }
 
  private:
   base::TimeTicks now_;
@@ skipping 126 matching lines @@
 
   time_domain_->UnregisterQueue(task_queue_.get());
   task_queue_ = scoped_refptr<internal::TaskQueueImpl>();
   EXPECT_TRUE(time_domain_->NextScheduledTaskQueue(&next_task_queue));
   EXPECT_EQ(task_queue2_.get(), next_task_queue);
 
   time_domain_->UnregisterQueue(task_queue2_.get());
   EXPECT_FALSE(time_domain_->NextScheduledTaskQueue(&next_task_queue));
 }
 
-TEST_F(TimeDomainTest, WakeupReadyDelayedQueues) {
+TEST_F(TimeDomainTest, UpdateWorkQueues) {
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(50);
   EXPECT_CALL(*time_domain_.get(), RequestWakeup(_, delay));
   base::TimeTicks now = time_domain_->Now();
   base::TimeTicks delayed_runtime = now + delay;
   time_domain_->ScheduleDelayedWork(task_queue_.get(), delayed_runtime, now);
 
   base::TimeTicks next_run_time;
   ASSERT_TRUE(time_domain_->NextScheduledRunTime(&next_run_time));
   EXPECT_EQ(delayed_runtime, next_run_time);
 
   LazyNow lazy_now = time_domain_->CreateLazyNow();
-  time_domain_->WakeupReadyDelayedQueues(&lazy_now);
+  time_domain_->UpdateWorkQueues(lazy_now);
   ASSERT_TRUE(time_domain_->NextScheduledRunTime(&next_run_time));
   EXPECT_EQ(delayed_runtime, next_run_time);
 
   time_domain_->SetNow(delayed_runtime);
   lazy_now = time_domain_->CreateLazyNow();
-  time_domain_->WakeupReadyDelayedQueues(&lazy_now);
+  time_domain_->UpdateWorkQueues(lazy_now);
   ASSERT_FALSE(time_domain_->NextScheduledRunTime(&next_run_time));
 }
 
 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());
+  time_domain_->RegisterAsUpdatableTaskQueue(task_queue_.get());
 }
 
 TEST_F(TimeDomainWithObserverTest, OnTimeDomainHasDelayedWork) {
   EXPECT_CALL(*observer_, OnTimeDomainHasDelayedWork(task_queue_.get()));
   EXPECT_CALL(*time_domain_.get(), RequestWakeup(_, _));
   base::TimeTicks now = time_domain_->Now();
   time_domain_->ScheduleDelayedWork(
       task_queue_.get(), now + base::TimeDelta::FromMilliseconds(10), now);
 }
 
 }  // namespace scheduler
 }  // namespace blink