Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2674)

Unified Diff: cc/input/top_controls_manager_unittest.cc

Issue 1143433005: Remove gfx::FrameTime for a single clock source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handling patch for mac files Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/input/top_controls_manager_unittest.cc
diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc
index 52e46e674ed26c064124b0c210b9df3eb709205e..788acbb9ea0857185bad534d8f14ff7e8317bc99 100644
--- a/cc/input/top_controls_manager_unittest.cc
+++ b/cc/input/top_controls_manager_unittest.cc
@@ -18,7 +18,6 @@
#include "cc/test/test_task_graph_runner.h"
#include "cc/trees/layer_tree_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/frame_time.h"
#include "ui/gfx/geometry/vector2d_f.h"
namespace cc {
@@ -159,7 +158,7 @@ TEST(TopControlsManagerTest, PartialShownHideAnimation) {
EXPECT_TRUE(manager->animation());
- base::TimeTicks time = gfx::FrameTime::Now();
+ base::TimeTicks time = base::TimeTicks::Now();
float previous;
while (manager->animation()) {
previous = manager->TopControlsShownRatio();
@@ -189,7 +188,7 @@ TEST(TopControlsManagerTest, PartialShownShowAnimation) {
EXPECT_TRUE(manager->animation());
- base::TimeTicks time = gfx::FrameTime::Now();
+ base::TimeTicks time = base::TimeTicks::Now();
float previous;
while (manager->animation()) {
previous = manager->TopControlsShownRatio();
@@ -215,7 +214,7 @@ TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdShows) {
manager->ScrollEnd();
EXPECT_TRUE(manager->animation());
- base::TimeTicks time = gfx::FrameTime::Now();
+ base::TimeTicks time = base::TimeTicks::Now();
float previous;
while (manager->animation()) {
previous = manager->TopControlsShownRatio();
@@ -241,7 +240,7 @@ TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) {
manager->ScrollEnd();
EXPECT_TRUE(manager->animation());
- base::TimeTicks time = gfx::FrameTime::Now();
+ base::TimeTicks time = base::TimeTicks::Now();
float previous;
while (manager->animation()) {
previous = manager->TopControlsShownRatio();
@@ -271,7 +270,7 @@ TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) {
manager->ScrollEnd();
EXPECT_TRUE(manager->animation());
- base::TimeTicks time = gfx::FrameTime::Now();
+ base::TimeTicks time = base::TimeTicks::Now();
float previous;
while (manager->animation()) {
previous = manager->TopControlsShownRatio();
@@ -301,7 +300,7 @@ TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdShows) {
manager->ScrollEnd();
EXPECT_TRUE(manager->animation());
- base::TimeTicks time = gfx::FrameTime::Now();
+ base::TimeTicks time = base::TimeTicks::Now();
float previous;
while (manager->animation()) {
previous = manager->TopControlsShownRatio();

Powered by Google App Engine
This is Rietveld 408576698