Replaced TestNowSource with SimpleTestTickClock.

cc/surfaces/surface_display_output_surface_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 "cc/surfaces/surface_display_output_surface.h"
 
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/fake_output_surface.h"
@@ skipping 29 matching lines @@
 
   FakeOutputSurface* output_surface() { return fake_output_surface_; }
 
  protected:
   FakeOutputSurface* fake_output_surface_;
 };
 
 class SurfaceDisplayOutputSurfaceTest : public testing::Test {
  public:
   SurfaceDisplayOutputSurfaceTest()
-      : task_runner_(new OrderedSimpleTaskRunner()),
+      : now_src_(new base::SimpleTestTickClock()),
+        task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
         allocator_(0),
         display_size_(1920, 1080),
         display_rect_(display_size_),
         display_client_(&surface_manager_,
                         &bitmap_manager_,
                         &gpu_memory_buffer_manager_,
                         renderer_settings_,
                         task_runner_),
         context_provider_(TestContextProvider::Create()),
         surface_display_output_surface_(&surface_manager_,
@@ skipping 30 matching lines @@
   void SetUp() override {
     // Draw the first frame to start in an "unlocked" state.
     SwapBuffersWithDamage(display_rect_);
 
     EXPECT_EQ(0u, output_surface_->num_sent_frames());
     task_runner_->RunUntilIdle();
     EXPECT_EQ(1u, output_surface_->num_sent_frames());
   }
 
  protected:
+  scoped_ptr<base::SimpleTestTickClock> now_src_;
   scoped_refptr<OrderedSimpleTaskRunner> task_runner_;
   SurfaceIdAllocator allocator_;
 
   const gfx::Size display_size_;
   const gfx::Rect display_rect_;
   FakeOutputSurface* output_surface_;
   SurfaceManager surface_manager_;
   TestSharedBitmapManager bitmap_manager_;
   TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   RendererSettings renderer_settings_;
@@ skipping 27 matching lines @@
   EXPECT_EQ(1u, output_surface_->num_sent_frames());
 
   SwapBuffersWithDamage(gfx::Rect());
   EXPECT_EQ(1u, output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, output_surface_->num_sent_frames());
 }
 
 }  // namespace
 }  // namespace cc