Roll Chrome into Mojo.

gpu/command_buffer/tests/gl_query_unittest.cc

Index: gpu/command_buffer/tests/gl_query_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_query_unittest.cc b/gpu/command_buffer/tests/gl_query_unittest.cc
index 5ea7e8d86a45a1462c330a622051975efeff32b9..b12adc333e473d66801233a040824da2cbd2e582 100644
--- a/gpu/command_buffer/tests/gl_query_unittest.cc
+++ b/gpu/command_buffer/tests/gl_query_unittest.cc
@@ -36,7 +36,7 @@ TEST_F(QueryTest, MultipleQueries) {
   GLuint available;
   GLuint result;
 
-  base::TimeTicks before = base::TimeTicks::HighResNow();
+  base::TimeTicks before = base::TimeTicks::Now();
 
   // Begin two queries of different types
   glBeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, commands_issue_query);
@@ -50,7 +50,7 @@ TEST_F(QueryTest, MultipleQueries) {
 
   glFinish();
 
-  base::TimeTicks after = base::TimeTicks::HighResNow();
+  base::TimeTicks after = base::TimeTicks::Now();
 
   // Check that we got result on both queries.
 
@@ -152,7 +152,7 @@ TEST_F(QueryTest, CommandsCompleted) {
     return;
   }
 
-  base::TimeTicks before = base::TimeTicks::HighResNow();
+  base::TimeTicks before = base::TimeTicks::Now();
 
   GLuint query;
   glGenQueriesEXT(1, &query);
@@ -164,7 +164,7 @@ TEST_F(QueryTest, CommandsCompleted) {
   GLuint result = 0;
   glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &result);
 
-  base::TimeTicks after = base::TimeTicks::HighResNow();
+  base::TimeTicks after = base::TimeTicks::Now();
   // Sanity check - the resulting delta is shorter than the time it took to
   // run this test.
   EXPECT_LE(result, base::TimeDelta(after - before).InMicroseconds());
@@ -194,5 +194,3 @@ TEST_F(QueryTest, CommandsCompletedWithFinish) {
 }
 
 }  // namespace gpu
-
-