Remove gfx::FrameTime for a single clock source

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 47 matching lines @@
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "media/base/media.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
-#include "ui/gfx/frame_time.h"
+
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::AnyNumber;
 using ::testing::AtLeast;
 using ::testing::_;
 using media::VideoFrame;
@@ skipping 1563 matching lines @@
   }
 
   void RunTest(LayerTreeSettings::ScrollbarAnimator animator) {
     LayerTreeSettings settings;
     settings.scrollbar_animator = animator;
     settings.scrollbar_fade_delay_ms = 20;
     settings.scrollbar_fade_duration_ms = 20;
 
     SetupLayers(settings);
 
-    base::TimeTicks fake_now = gfx::FrameTime::Now();
+    base::TimeTicks fake_now = base::TimeTicks::Now();
 
     EXPECT_FALSE(did_request_animate_);
     EXPECT_FALSE(did_request_redraw_);
     EXPECT_EQ(base::TimeDelta(), requested_animation_delay_);
     EXPECT_TRUE(animation_task_.Equals(base::Closure()));
 
     // If no scroll happened during a scroll gesture, it should have no effect.
     host_impl_->ScrollBegin(gfx::Point(), InputHandler::WHEEL);
     host_impl_->ScrollEnd();
     EXPECT_FALSE(did_request_animate_);
@@ skipping 5171 matching lines @@
 
   // End the scroll while the controls are still offset from their limit.
   host_impl_->ScrollEnd();
   ASSERT_TRUE(host_impl_->top_controls_manager()->animation());
   EXPECT_TRUE(did_request_animate_);
   EXPECT_TRUE(did_request_redraw_);
   EXPECT_FALSE(did_request_commit_);
 
   // The top controls should properly animate until finished, despite the scroll
   // offset being at the origin.
-  base::TimeTicks animation_time = gfx::FrameTime::Now();
+  base::TimeTicks animation_time = base::TimeTicks::Now();
   while (did_request_animate_) {
     did_request_redraw_ = false;
     did_request_animate_ = false;
     did_request_commit_ = false;
 
     float old_offset =
         host_impl_->top_controls_manager()->ControlsTopOffset();
 
     animation_time += base::TimeDelta::FromMilliseconds(5);
     host_impl_->Animate(animation_time);
@@ skipping 49 matching lines @@
   did_request_commit_ = false;
 
   // End the scroll while the controls are still offset from the limit.
   host_impl_->ScrollEnd();
   ASSERT_TRUE(host_impl_->top_controls_manager()->animation());
   EXPECT_TRUE(did_request_animate_);
   EXPECT_TRUE(did_request_redraw_);
   EXPECT_FALSE(did_request_commit_);
 
   // Animate the top controls to the limit.
-  base::TimeTicks animation_time = gfx::FrameTime::Now();
+  base::TimeTicks animation_time = base::TimeTicks::Now();
   while (did_request_animate_) {
     did_request_redraw_ = false;
     did_request_animate_ = false;
     did_request_commit_ = false;
 
     float old_offset =
         host_impl_->top_controls_manager()->ControlsTopOffset();
 
     animation_time += base::TimeDelta::FromMilliseconds(5);
     host_impl_->Animate(animation_time);
@@ skipping 43 matching lines @@
   did_request_commit_ = false;
 
   // End the fling while the controls are still offset from the limit.
   host_impl_->MainThreadHasStoppedFlinging();
   ASSERT_TRUE(host_impl_->top_controls_manager()->animation());
   EXPECT_TRUE(did_request_animate_);
   EXPECT_TRUE(did_request_redraw_);
   EXPECT_FALSE(did_request_commit_);
 
   // Animate the top controls to the limit.
-  base::TimeTicks animation_time = gfx::FrameTime::Now();
+  base::TimeTicks animation_time = base::TimeTicks::Now();
   while (did_request_animate_) {
     did_request_redraw_ = false;
     did_request_animate_ = false;
     did_request_commit_ = false;
 
     float old_offset = host_impl_->top_controls_manager()->ControlsTopOffset();
 
     animation_time += base::TimeDelta::FromMilliseconds(5);
     host_impl_->Animate(animation_time);
 
@@ skipping 791 matching lines @@
   host_impl_->set_has_gpu_rasterization_trigger(false);
   host_impl_->set_content_is_suitable_for_gpu_rasterization(false);
   host_impl_->UpdateGpuRasterizationStatus();
   EXPECT_EQ(GpuRasterizationStatus::ON_FORCED,
             host_impl_->gpu_rasterization_status());
   EXPECT_TRUE(host_impl_->use_gpu_rasterization());
 }
 
 }  // namespace
 }  // namespace cc