Replaced TestNowSource with SimpleTestTickClock.

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/test/simple_test_tick_clock.h"
 #include "cc/test/ordered_simple_task_runner.h"
-#include "cc/test/test_now_source.h"
 #include "components/scheduler/child/nestable_task_runner_for_test.h"
 #include "components/scheduler/child/scheduler_message_loop_delegate.h"
 #include "components/scheduler/child/test_time_source.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 16 matching lines @@
         FROM_HERE,
         base::Bind(AppendToVectorReentrantTask, base::Unretained(task_runner),
                    vector, reentrant_count, max_reentrant_count));
   }
 }
 
 };  // namespace
 
 class SchedulerHelperTest : public testing::Test {
  public:
-  SchedulerHelperTest()
-      : clock_(cc::TestNowSource::Create(5000)),
-        mock_task_runner_(new cc::OrderedSimpleTaskRunner(clock_, false)),
-        nestable_task_runner_(
-            NestableTaskRunnerForTest::Create(mock_task_runner_)),
-        scheduler_helper_(
-            new SchedulerHelper(nestable_task_runner_,
-                                "test.scheduler",
-                                TRACE_DISABLED_BY_DEFAULT("test.scheduler"),
-                                SchedulerHelper::TASK_QUEUE_COUNT)),
-        default_task_runner_(scheduler_helper_->DefaultTaskRunner()) {
+  SchedulerHelperTest() : clock_(new base::SimpleTestTickClock()) {
+    clock_->Advance(base::TimeDelta::FromInternalValue(5000));

[Sami, 2015/05/29 14:00:58]

Same question about the starting value as before.

[Ankur Verma, 2015/06/03 14:56:10]

Have'nt changed starting values yet as per mithro's explaination.

+    mock_task_runner_ = new cc::OrderedSimpleTaskRunner(clock_, false);
+    nestable_task_runner_ =
+        NestableTaskRunnerForTest::Create(mock_task_runner_);
+    scheduler_helper_ = make_scoped_ptr(
+        new SchedulerHelper(nestable_task_runner_, "test.scheduler",
+                            TRACE_DISABLED_BY_DEFAULT("test.scheduler"),
+                            SchedulerHelper::TASK_QUEUE_COUNT));
+    default_task_runner_ = scheduler_helper_->DefaultTaskRunner();
     scheduler_helper_->SetTimeSourceForTesting(
         make_scoped_ptr(new TestTimeSource(clock_)));
     scheduler_helper_->GetTaskQueueManagerForTesting()->SetTimeSourceForTesting(
         make_scoped_ptr(new TestTimeSource(clock_)));
   }
 
   ~SchedulerHelperTest() override {}
 
   void TearDown() override {
     // Check that all tests stop posting tasks.
@@ skipping 14 matching lines @@
     }
   }
 
   static void CheckAllTaskQueueIdToString() {
     CallForEachEnumValue<SchedulerHelper::QueueId>(
         SchedulerHelper::FIRST_QUEUE_ID, SchedulerHelper::TASK_QUEUE_COUNT,
         &SchedulerHelper::TaskQueueIdToString);
   }
 
  protected:
-  scoped_refptr<cc::TestNowSource> clock_;
+  base::SimpleTestTickClock* clock_;

[Sami, 2015/05/29 14:00:58]

scoped_ptr here too.

[Ankur Verma, 2015/06/03 14:56:10]

Done.

   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
 
   scoped_refptr<NestableSingleThreadTaskRunner> nestable_task_runner_;
   scoped_ptr<SchedulerHelper> scheduler_helper_;
   scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(SchedulerHelperTest);
 };
 
 TEST_F(SchedulerHelperTest, TestPostDefaultTask) {
@@ skipping 29 matching lines @@
 
   scheduler_helper_->Shutdown();
   EXPECT_TRUE(scheduler_helper_->IsShutdown());
 }
 
 TEST_F(SchedulerHelperTest, TaskQueueIdToString) {
   CheckAllTaskQueueIdToString();
 }
 
 }  // namespace scheduler