Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/command_buffer/service/gpu_timing.h

Index: gpu/command_buffer/service/gpu_timing.h
diff --git a/gpu/command_buffer/service/gpu_timing.h b/gpu/command_buffer/service/gpu_timing.h
index 726ac4e5f776a19a466276edd017a4a48cfc0446..1d9ecf690902e2725ff14f97a96f129ee95e1e2b 100644
--- a/gpu/command_buffer/service/gpu_timing.h
+++ b/gpu/command_buffer/service/gpu_timing.h
@@ -8,12 +8,10 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/gpu_export.h"
-
-namespace gfx {
-class GLContext;
-}
+#include "ui/gl/gl_bindings.h"
 
 namespace gpu {
+
 class GPUTiming;
 
 // Class to compute the amount of time it takes to fully
@@ -32,7 +30,7 @@ class GPU_EXPORT GPUTimer {
   int64 GetDeltaElapsed();
 
  private:
-  unsigned int queries_[2];
+  GLuint queries_[2];
   int64 offset_ = 0;
   bool end_requested_ = false;
   GPUTiming* gpu_timing_;