gfx: Add FrameTime and DisplayTime classes

ash/wm/window_animations_unittest.cc

Index: ash/wm/window_animations_unittest.cc
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
index c2ea1f6365f1dfa584e993235e801797ee8cd923..761b98a04c0f508eac41a9642dfebd880deaba93 100644
--- a/ash/wm/window_animations_unittest.cc
+++ b/ash/wm/window_animations_unittest.cc
@@ -14,6 +14,7 @@
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/animation/animation_container_element.h"
+#include "ui/gfx/frame_time.h"
 
 using aura::Window;
 using ui::Layer;
@@ -60,7 +61,7 @@ TEST_F(WindowAnimationsTest, HideShowBrightnessGrayscaleAnimation) {
   gfx::AnimationContainerElement* element =
       static_cast<gfx::AnimationContainerElement*>(
       window->layer()->GetAnimator());
-  element->Step(base::TimeTicks::Now() +
+  element->Step(gfx::FrameTime::Now() +
                 base::TimeDelta::FromSeconds(5));
   EXPECT_EQ(0.0f, window->layer()->GetTargetBrightness());
   EXPECT_EQ(0.0f, window->layer()->GetTargetGrayscale());
@@ -107,9 +108,9 @@ TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
 
   // Run the animations to completion.
   static_cast<gfx::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
-      base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
+      gfx::FrameTime::Now() + base::TimeDelta::FromSeconds(1));
   static_cast<gfx::AnimationContainerElement*>(window->layer()->GetAnimator())->
-      Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
+      Step(gfx::FrameTime::Now() + base::TimeDelta::FromSeconds(1));
 
   // Cross fade to a smaller size, as in a restore animation.
   old_layer = window->layer();
@@ -128,9 +129,9 @@ TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
   EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
 
   static_cast<gfx::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
-      base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
+      gfx::FrameTime::Now() + base::TimeDelta::FromSeconds(1));
   static_cast<gfx::AnimationContainerElement*>(window->layer()->GetAnimator())->
-      Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
+      Step(gfx::FrameTime::Now() + base::TimeDelta::FromSeconds(1));
 }
 
 }  // namespace internal