Force time elapsed queries on certain drivers.

gpu/command_buffer/service/query_manager_unittest.cc

Index: gpu/command_buffer/service/query_manager_unittest.cc
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
index 8f61ff22bd606af859e2ab3bfcc4e5985b91917d..cbf2d8918945cf540e8323bb714b0e57c7749017 100644
--- a/gpu/command_buffer/service/query_manager_unittest.cc
+++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -814,7 +814,7 @@ TEST_F(QueryManagerTest, TimeStampQuery) {
   const uint64_t expected_result =
       100u * base::Time::kNanosecondsPerMicrosecond;
   fake_timing_queries.SetCurrentGLTime(expected_result);
-  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false);
+  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false, true);
   EXPECT_TRUE(manager_->QueryCounter(query, kSubmitCount));
   EXPECT_TRUE(manager_->ProcessPendingQueries(false));
 
@@ -852,7 +852,7 @@ TEST_F(QueryManagerManualSetupTest, TimeStampDisjoint) {
   // Disjoint happening before the query should not trigger a disjoint event.
   fake_timing_queries.SetDisjoint();
 
-  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false);
+  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false, true);
   EXPECT_TRUE(manager_->QueryCounter(query, kSubmitCount));
   EXPECT_TRUE(manager_->ProcessPendingQueries(false));
 
@@ -860,7 +860,7 @@ TEST_F(QueryManagerManualSetupTest, TimeStampDisjoint) {
   EXPECT_EQ(current_disjoint_value, disjoint_sync->GetDisjointCount());
 
   // Disjoint happening during query should trigger disjoint event.
-  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false);
+  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false, false);
   EXPECT_TRUE(manager_->QueryCounter(query, kSubmitCount));
   fake_timing_queries.SetDisjoint();
   EXPECT_TRUE(manager_->ProcessPendingQueries(false));
@@ -900,7 +900,7 @@ TEST_F(QueryManagerManualSetupTest, DisjointContinualTest) {
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
   ASSERT_TRUE(query != NULL);
 
-  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false);
+  fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false, true);
   EXPECT_TRUE(manager_->QueryCounter(query, kSubmitCount));
   EXPECT_TRUE(manager_->ProcessPendingQueries(false));