Update from chromium https://crrev.com/304586

gpu/command_buffer/tests/gl_query_unittest.cc

 // Copyright 2014 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "base/threading/platform_thread.h"
 #include "gpu/command_buffer/tests/gl_manager.h"
@@ skipping 45 matching lines @@
 
   available = 0;
   result = 0;
   glGetQueryObjectuivEXT(commands_issue_query,
                          GL_QUERY_RESULT_AVAILABLE_EXT,
                          &available);
   EXPECT_TRUE(available);
   glGetQueryObjectuivEXT(commands_issue_query, GL_QUERY_RESULT_EXT, &result);
   // Sanity check - the resulting delta is shorter than the time it took to
   // run this test.
-  EXPECT_LT(result, base::TimeDelta(after - before).InMicroseconds());
+  EXPECT_LE(result, base::TimeDelta(after - before).InMicroseconds());
 
   result = 0;
   available = 0;
   glGetQueryObjectuivEXT(error_query,
                          GL_QUERY_RESULT_AVAILABLE_EXT,
                          &available);
   EXPECT_TRUE(available);
   glGetQueryObjectuivEXT(error_query, GL_QUERY_RESULT_EXT, &result);
   EXPECT_EQ(static_cast<uint32>(GL_INVALID_ENUM), result);
 }
@@ skipping 68 matching lines @@
 
   EXPECT_LE(query_result, kTimePrecisionMicroseconds);
 }
 
 TEST_F(QueryTest, CommandsCompleted) {
   if (!GLTestHelper::HasExtension("GL_CHROMIUM_sync_query")) {
     LOG(INFO) << "GL_CHROMIUM_sync_query not supported. Skipping test...";
     return;
   }
 
+  base::TimeTicks before = base::TimeTicks::HighResNow();
+
   GLuint query;
   glGenQueriesEXT(1, &query);
   glBeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, query);
   glClearColor(0.0, 0.0, 1.0, 1.0);
   glClear(GL_COLOR_BUFFER_BIT);
   glEndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
   glFlush();
   GLuint result = 0;
   glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &result);
-  EXPECT_EQ(0u, result);
+
+  base::TimeTicks after = base::TimeTicks::HighResNow();
+  // Sanity check - the resulting delta is shorter than the time it took to
+  // run this test.
+  EXPECT_LE(result, base::TimeDelta(after - before).InMicroseconds());
+
   glDeleteQueriesEXT(1, &query);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 TEST_F(QueryTest, CommandsCompletedWithFinish) {
   if (!GLTestHelper::HasExtension("GL_CHROMIUM_sync_query")) {
     LOG(INFO) << "GL_CHROMIUM_sync_query not supported. Skipping test...";
     return;
   }
 
   GLuint query;
   glGenQueriesEXT(1, &query);
   glBeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, query);
   glClearColor(0.0, 0.0, 1.0, 1.0);
   glClear(GL_COLOR_BUFFER_BIT);
   glEndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
   glFinish();
   GLuint result = 0;
   glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &result);
   EXPECT_EQ(1u, result);
   glDeleteQueriesEXT(1, &query);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 }  // namespace gpu