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

ui/gl/gpu_timing_fake.cc

 // Copyright 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_fake.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
 namespace gfx {
@@ skipping 59 matching lines @@
   }
 
   // Time Elapsed based queries.
   EXPECT_CALL(gl, BeginQuery(GL_TIME_ELAPSED, _))
       .WillRepeatedly(
           Invoke(this, &GPUTimingFake::FakeGLBeginQuery));
 
   EXPECT_CALL(gl, EndQuery(GL_TIME_ELAPSED))
       .WillRepeatedly(Invoke(this, &GPUTimingFake::FakeGLEndQuery));
 
-  EXPECT_CALL(gl, GetQueryObjectuiv(_, GL_QUERY_RESULT_AVAILABLE,
-                                    NotNull()))
+  EXPECT_CALL(gl, GetQueryObjectiv(_, GL_QUERY_RESULT_AVAILABLE,
+                                        NotNull()))
       .WillRepeatedly(
-          Invoke(this, &GPUTimingFake::FakeGLGetQueryObjectuiv));
+          Invoke(this, &GPUTimingFake::FakeGLGetQueryObjectiv));
 
   EXPECT_CALL(gl, GetQueryObjectui64v(_, GL_QUERY_RESULT, NotNull()))
       .WillRepeatedly(
            Invoke(this, &GPUTimingFake::FakeGLGetQueryObjectui64v));
 
   EXPECT_CALL(gl, DeleteQueries(1, NotNull())).Times(AtLeast(2))
       .WillRepeatedly(
            Invoke(this, &GPUTimingFake::FakeGLDeleteQueries));
 }
 
@@ skipping 48 matching lines @@
       query.type_ = QueryResult::kQueryResultType_Elapsed;
       query.begin_time_ = current_elapsed_query_.begin_time_;
       query.value_ = current_time_;
       current_elapsed_query_.active_ = false;
     } break;
     default:
       FAIL() << "Invalid target passed to BeginQuery: " << target;
   }
 }
 
-void GPUTimingFake::FakeGLGetQueryObjectuiv(GLuint id, GLenum pname,
-                                            GLuint* params) {
+void GPUTimingFake::FakeGLGetQueryObjectiv(GLuint id, GLenum pname,
+                                                    GLint* params) {
   switch (pname) {
     case GL_QUERY_RESULT_AVAILABLE: {
       std::map<GLuint, QueryResult>::iterator it = query_results_.find(id);
       if (it != query_results_.end() && it->second.value_ <= current_time_)
         *params = 1;
       else
         *params = 0;
     } break;
     default:
-      FAIL() << "Invalid variable passed to GetQueryObjectuiv: " << pname;
+      FAIL() << "Invalid variable passed to GetQueryObjectiv: " << pname;
   }
 }
 
 void GPUTimingFake::FakeGLQueryCounter(GLuint id, GLenum target) {
   switch (target) {
     case GL_TIMESTAMP: {
       ASSERT_TRUE(allocated_queries_.find(id) != allocated_queries_.end());
       QueryResult& query = query_results_[id];
       query.type_ = QueryResult::kQueryResultType_TimeStamp;
       query.value_ = current_time_;
     } break;
 
     default:
       FAIL() << "Invalid variable passed to QueryCounter: " << target;
   }
 }
 
 void GPUTimingFake::FakeGLGetInteger64v(GLenum pname, GLint64 * data) {
   switch (pname) {
     case GL_TIMESTAMP:
       *data = current_time_;
       break;
     default:
       FAIL() << "Invalid variable passed to GetInteger64v: " << pname;
   }
 }
 
 void GPUTimingFake::FakeGLGetQueryObjectui64v(GLuint id, GLenum pname,
-                                              GLuint64* params) {
+                                                       GLuint64* params) {
   switch (pname) {
     case GL_QUERY_RESULT: {
       std::map<GLuint, QueryResult>::iterator it = query_results_.find(id);
       ASSERT_TRUE(it != query_results_.end());
       switch (it->second.type_) {
         case QueryResult::kQueryResultType_TimeStamp:
           *params = it->second.value_;
           break;
         case QueryResult::kQueryResultType_Elapsed:
           *params = it->second.value_ - it->second.begin_time_;
@@ skipping 16 matching lines @@
     default:
       FAIL() << "Invalid variable passed to GetIntegerv: " << pname;
   }
 }
 
 GLenum GPUTimingFake::FakeGLGetError() {
   return GL_NO_ERROR;
 }
 
 }  // namespace gfx