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

components/scheduler/child/scheduler_helper_unittest.cc

 // Copyright 2014 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/child/scheduler_helper.h"
 
 #include "base/callback.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"
+#include "components/scheduler/base/lazy_now.h"
 #include "components/scheduler/base/task_queue.h"
 #include "components/scheduler/base/test_time_source.h"
 #include "components/scheduler/child/scheduler_tqm_delegate_for_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::Invoke;
 using testing::Return;
@@ skipping 150 matching lines @@
 TEST_F(SchedulerHelperTest,
        ObserversNotNotifiedFor_ControlAfterWakeUpTaskRunner) {
   MockTaskObserver observer;
   scheduler_helper_->AddTaskObserver(&observer);
 
   scheduler_helper_->ControlAfterWakeUpTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&NopTask));
 
   EXPECT_CALL(observer, WillProcessTask(_)).Times(0);
   EXPECT_CALL(observer, DidProcessTask(_)).Times(0);
-  scheduler_helper_->ControlAfterWakeUpTaskRunner()->PumpQueue(true);
+  LazyNow lazy_now(clock_.get());
+  scheduler_helper_->ControlAfterWakeUpTaskRunner()->PumpQueue(&lazy_now, true);
   RunUntilIdle();
 }
 
 namespace {
 
 class MockObserver : public SchedulerHelper::Observer {
  public:
   MOCK_METHOD1(OnUnregisterTaskQueue,
                void(const scoped_refptr<TaskQueue>& queue));
   MOCK_METHOD2(OnTriedToExecuteBlockedTask,
@@ skipping 24 matching lines @@
   task_queue->SetQueueEnabled(false);
   task_queue->PostTask(FROM_HERE, base::Bind(&NopTask));
 
   EXPECT_CALL(observer, OnTriedToExecuteBlockedTask(_, _)).Times(1);
   RunUntilIdle();
 
   scheduler_helper_->SetObserver(nullptr);
 }
 
 }  // namespace scheduler