Patch from https://codereview.chromium.org/11111005/ without actual file deletes

cc/throttled_texture_uploader.cc

Index: cc/throttled_texture_uploader.cc
diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
index 0e3f8291784516c50ead3a4f2f59fd8e653fc144..2a44289e115422ae851c653c190291866ceaac87 100644
--- a/cc/throttled_texture_uploader.cc
+++ b/cc/throttled_texture_uploader.cc
@@ -5,9 +5,10 @@
 #include "config.h"
 #include "ThrottledTextureUploader.h"
 
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
 #include "CCPrioritizedTexture.h"
 #include "CCProxy.h"
-#include "Extensions3DChromium.h"
 #include "SkGpuDevice.h"
 #include "TraceEvent.h"
 #include <algorithm>
@@ -68,18 +69,18 @@ void ThrottledTextureUploader::Query::begin()
 {
     m_hasValue = false;
     m_isNonBlocking = false;
-    m_context->beginQueryEXT(Extensions3DChromium::COMMANDS_ISSUED_CHROMIUM, m_queryId);
+    m_context->beginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, m_queryId);
 }
 
 void ThrottledTextureUploader::Query::end()
 {
-    m_context->endQueryEXT(Extensions3DChromium::COMMANDS_ISSUED_CHROMIUM);
+    m_context->endQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
 }
 
 bool ThrottledTextureUploader::Query::isPending()
 {
     unsigned available = 1;
-    m_context->getQueryObjectuivEXT(m_queryId, Extensions3DChromium::QUERY_RESULT_AVAILABLE_EXT, &available);
+    m_context->getQueryObjectuivEXT(m_queryId, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
     return !available;
 }
 
@@ -92,7 +93,7 @@ void ThrottledTextureUploader::Query::wait()
 unsigned ThrottledTextureUploader::Query::value()
 {
     if (!m_hasValue) {
-        m_context->getQueryObjectuivEXT(m_queryId, Extensions3DChromium::QUERY_RESULT_EXT, &m_value);
+        m_context->getQueryObjectuivEXT(m_queryId, GL_QUERY_RESULT_EXT, &m_value);
         m_hasValue = true;
     }
     return m_value;