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

ui/gl/gpu_timing_fake.h

 // 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.
 
 #ifndef UI_GL_GPU_TIMING_FAKE_H_
 #define UI_GL_GPU_TIMING_FAKE_H_
 
 #include <map>
 #include <set>
 
@@ skipping 23 matching lines @@
   // GPUTimer fake queries which can only be called once per setup.
   void ExpectGPUTimerQuery(MockGLInterface& gl, bool elapsed_query);
   void ExpectOffsetCalculationQuery(MockGLInterface& gl);
   void ExpectNoOffsetCalculationQuery(MockGLInterface& gl);
 
   // Fake GL Functions.
   void FakeGLGenQueries(GLsizei n, GLuint* ids);
   void FakeGLDeleteQueries(GLsizei n, const GLuint* ids);
   void FakeGLBeginQuery(GLenum target, GLuint id);
   void FakeGLEndQuery(GLenum target);
-  void FakeGLGetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params);
+  void FakeGLGetQueryObjectiv(GLuint id, GLenum pname, GLint* params);
   void FakeGLQueryCounter(GLuint id, GLenum target);
   void FakeGLGetInteger64v(GLenum pname, GLint64 * data);
   void FakeGLGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64* params);
   void FakeGLGetIntegerv(GLenum pname, GLint* params);
   GLenum FakeGLGetError();
 
  protected:
   bool disjointed_ = false;
   GLint64 current_time_ = 0;
   GLuint next_query_id_ = 0;
@@ skipping 18 matching lines @@
       query_id_ = 0;
       begin_time_ = 0;
     }
   };
   ElapsedQuery current_elapsed_query_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GPU_TIMING_FAKE_H_