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

Unified Diff: cc/test/begin_frame_args_test.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/test/begin_frame_args_test.cc
diff --git a/cc/test/begin_frame_args_test.cc b/cc/test/begin_frame_args_test.cc
index 7b2974867469d3803d029dedc483dff233290edb..c176a0e6ee877333bc6e20511b1b768ad72f58fd 100644
--- a/cc/test/begin_frame_args_test.cc
+++ b/cc/test/begin_frame_args_test.cc
@@ -6,13 +6,12 @@
#include "base/time/time.h"
#include "cc/output/begin_frame_args.h"
-#include "ui/gfx/frame_time.h"
namespace cc {
BeginFrameArgs CreateBeginFrameArgsForTesting(
BeginFrameArgs::CreationLocation location) {
- return CreateBeginFrameArgsForTesting(location, gfx::FrameTime::Now());
+ return CreateBeginFrameArgsForTesting(location, base::TimeTicks::Now());
}
BeginFrameArgs CreateBeginFrameArgsForTesting(
@@ -49,7 +48,7 @@ BeginFrameArgs CreateBeginFrameArgsForTesting(
BeginFrameArgs CreateExpiredBeginFrameArgsForTesting(
BeginFrameArgs::CreationLocation location) {
- base::TimeTicks now = gfx::FrameTime::Now();
+ base::TimeTicks now = base::TimeTicks::Now();
return BeginFrameArgs::Create(
location, now, now - BeginFrameArgs::DefaultInterval(),
BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);

Powered by Google App Engine
This is Rietveld 408576698