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

components/scheduler/base/time_domain.h

 // 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.
 
 #ifndef COMPONENTS_SCHEDULER_BASE_TIME_DOMAIN_H_
 #define COMPONENTS_SCHEDULER_BASE_TIME_DOMAIN_H_
 
 #include <map>
 
 #include "base/callback.h"
@@ skipping 32 matching lines @@
   virtual ~TimeDomain();
 
   // Returns a LazyNow that evaluate this TimeDomain's Now.  Can be called from
   // any thread.
   // TODO(alexclarke): Make this main thread only.
   virtual LazyNow CreateLazyNow() const = 0;
 
   // Evaluate this TimeDomain's Now. Can be called from any thread.
   virtual base::TimeTicks Now() const = 0;
 
-  // Computes a runtime which is >= |time_domain_now| + |delay|. This is used to
-  // allow the TimeDomain to decide if the real or virtual time should be used
-  // when computing the task run time.  This can be called from any thread.
-  virtual base::TimeTicks ComputeDelayedRunTime(
-      base::TimeTicks time_domain_now,
-      base::TimeDelta delay) const = 0;
-
   // Some TimeDomains support virtual time, this method tells us to advance time
   // if possible and return true if time was advanced.
   virtual bool MaybeAdvanceTime() = 0;
 
   // Returns the name of this time domain for tracing.
   virtual const char* GetName() const = 0;
 
   // If there is a scheduled delayed task, |out_time| is set to the scheduled
   // runtime for the next one and it returns true.  Returns false otherwise.
   bool NextScheduledRunTime(base::TimeTicks* out_time) const;
@@ skipping 84 matching lines @@
   Observer* observer_;  // NOT OWNED.
 
   base::ThreadChecker main_thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(TimeDomain);
 };
 
 }  // namespace scheduler
 
 #endif  // COMPONENTS_SCHEDULER_BASE_TIME_DOMAIN_H_