[Reland] Dont post delayed DoWork for disabled queues.

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

Index: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc
index 252f086813978c0c5c6185eb774e18df87e44f1f..c9c273b8c4f829bb027fff0fe31f2e09bbf49823 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc
@@ -218,10 +218,9 @@ void TaskQueueManager::MaybeScheduleImmediateWorkLocked(
 
 void TaskQueueManager::MaybeScheduleDelayedWork(
     const tracked_objects::Location& from_here,
-    base::TimeTicks now,
-    base::TimeDelta delay) {
+    LazyNow* lazy_now,

[Sami, 2016/12/14 16:29:38]

Not something for this patch, but I'm feeling a little nervous about all the
LazyNows we're passing around. It feels like it's too easy to accidentally keep
a LazyNow around for too long (say, around task observers) and end up with time
skew as a result. I wonder if we should add some DCHECKs or another mechanism to
guard against that?

[alex clarke (OOO till 29th), 2016/12/14 16:50:36]

Agreed it would be easy for that to happen.  I'll have to think if there's
something we can do.

+    base::TimeTicks run_time) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
-  DCHECK_GE(delay, base::TimeDelta());
   {
     base::AutoLock lock(any_thread_lock_);
 
@@ -236,19 +235,31 @@ void TaskQueueManager::MaybeScheduleDelayedWork(
   }
 
   // De-duplicate DoWork posts.
-  base::TimeTicks run_time = now + delay;
   if (next_delayed_do_work_ <= run_time && !next_delayed_do_work_.is_null())
     return;
 
+  cancelable_delayed_do_work_closure_.Reset(delayed_do_work_closure_);
+
+  base::TimeDelta delay =
+      std::max(base::TimeDelta(), run_time - lazy_now->Now());
+  next_delayed_do_work_ = lazy_now->Now() + delay;
+
   TRACE_EVENT1(tracing_category_, "MaybeScheduleDelayedWorkInternal",
                "delay_ms", delay.InMillisecondsF());
 
-  cancelable_delayed_do_work_closure_.Reset(delayed_do_work_closure_);
-  next_delayed_do_work_ = run_time;
   delegate_->PostDelayedTask(
       from_here, cancelable_delayed_do_work_closure_.callback(), delay);
 }
 
+void TaskQueueManager::CancelDelayedWork(base::TimeTicks run_time) {
+  DCHECK(main_thread_checker_.CalledOnValidThread());
+  if (next_delayed_do_work_ != run_time)
+    return;
+
+  cancelable_delayed_do_work_closure_.Cancel();
+  next_delayed_do_work_ = base::TimeTicks();
+}
+
 void TaskQueueManager::DoWork(bool delayed) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   TRACE_EVENT1("tracing_category_", "TaskQueueManager::DoWork", "delayed",