(Merge) Fix a bug that could occasionaly cause setInterval to stop

components/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 "components/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 23 matching lines @@
   using TimeDomain::NextScheduledTaskQueue;
   using TimeDomain::ScheduleDelayedWork;
   using TimeDomain::UnregisterQueue;
   using TimeDomain::UpdateWorkQueues;
   using TimeDomain::RegisterAsUpdatableTaskQueue;
 
   // TimeSource implementation:
   LazyNow CreateLazyNow() const override { return LazyNow(now_); }
   base::TimeTicks Now() const override { return now_; }
 
-  base::TimeTicks ComputeDelayedRunTime(base::TimeTicks time_domain_now,
-                                        base::TimeDelta delay) const override {
-    return time_domain_now + delay;
-  }
-
   void AsValueIntoInternal(
       base::trace_event::TracedValue* state) const override {}
 
   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));
 
@@ skipping 167 matching lines @@
 
 TEST_F(TimeDomainWithObserverTest, OnTimeDomainHasDelayedWork) {
   EXPECT_CALL(*observer_, OnTimeDomainHasDelayedWork());
   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