Revert of Added support for Time Elapsed queries through the command buffer.

ui/gl/gpu_timing.cc

 // Copyright (c) 2015 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 "ui/gl/gpu_timing.h"
 
 #include "base/time/time.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_version_info.h"
@@ skipping 185 matching lines @@
   // Returns true when UpdateQueryResults() is ready to be called.
   bool IsAvailable(GPUTimingImpl* gpu_timing) override {
     if (gpu_timing->GetElapsedQueryCount() != 0 &&
         gpu_timing->GetLastElapsedQuery() == this) {
       // Cannot query if result is available if EndQuery has not been called.
       // Since only one query is going on at a time, the end query is only not
       // called for the very last query when ongoing query counter is not 0.
       return false;
     }
 
-    GLuint done = 0;
-    glGetQueryObjectuiv(gl_query_id_, GL_QUERY_RESULT_AVAILABLE, &done);
+    GLint done = 0;
+    glGetQueryObjectiv(gl_query_id_, GL_QUERY_RESULT_AVAILABLE, &done);
     return !!done;
   }
 
   // Fills out query result start and end, called after IsAvailable() is true.
   void UpdateQueryResults(GPUTimingImpl* gpu_timing) override {
+    DCHECK(IsAvailable(gpu_timing));
+
     GLuint64 result_value = 0;
     glGetQueryObjectui64v(gl_query_id_, GL_QUERY_RESULT, &result_value);
     const int64_t micro_results = NanoToMicro(result_value);
 
     // Adjust prev query end time if it is before the current max.
     const int64_t start_time =
         std::max(first_top_level_query_ ? query_begin_cpu_time_ : 0,
                  std::max(prev_query_end_time_,
                           gpu_timing->GetMaxTimeStamp()));
 
@@ skipping 45 matching lines @@
   }
 
   scoped_refptr<QueryResult> DoQuery() {
     glQueryCounter(gl_query_id_, GL_TIMESTAMP);
     query_result_ = new QueryResult();
     return query_result_;
   }
 
   // Returns true when UpdateQueryResults() is ready to be called.
   bool IsAvailable(GPUTimingImpl* gpu_timing) override {
-    GLuint done = 0;
-    glGetQueryObjectuiv(gl_query_id_, GL_QUERY_RESULT_AVAILABLE, &done);
+    GLint done = 0;
+    glGetQueryObjectiv(gl_query_id_, GL_QUERY_RESULT_AVAILABLE, &done);
     return !!done;
   }
 
   // Fills out query result start and end, called after IsAvailable() is true.
   void UpdateQueryResults(GPUTimingImpl* gpu_timing) override {
     DCHECK(IsAvailable(gpu_timing));
 
     GLuint64 result_value = 0;
     glGetQueryObjectui64v(gl_query_id_, GL_QUERY_RESULT, &result_value);
     const int64_t micro_results = NanoToMicro(result_value);
@@ skipping 306 matching lines @@
 
 void GPUTimingClient::ForceTimeElapsedQuery() {
   DCHECK(gpu_timing_);
   gpu_timing_->ForceTimeElapsedQuery();
 }
 
 GPUTimingClient::~GPUTimingClient() {
 }
 
 }  // namespace gfx