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

cc/throttled_texture_uploader.cc

 // Copyright 2012 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 "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>
 #include <public/Platform.h>
 #include <public/WebGraphicsContext3D.h>
 #include <public/WebSharedGraphicsContext3D.h>
 #include <vector>
 
 using WebKit::WebGraphicsContext3D;
 using WebKit::WebSharedGraphicsContext3D;
@@ skipping 40 matching lines @@
 
 ThrottledTextureUploader::Query::~Query()
 {
     m_context->deleteQueryEXT(m_queryId);
 }
 
 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;
 }
 
 void ThrottledTextureUploader::Query::wait()
 {
     value();
     return;
 }
 
 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;
 }
 
 void ThrottledTextureUploader::Query::markAsNonBlocking()
 {
     m_isNonBlocking = true;
 }
 
@@ skipping 165 matching lines @@
         // Remove the oldest values from our history and insert the new one
         double texturesPerSecond = 1.0 / (usElapsed * 1e-6);
         m_texturesPerSecondHistory.pop_back();
         m_texturesPerSecondHistory.push_front(texturesPerSecond);
 
         m_availableQueries.append(m_pendingQueries.takeFirst());
     }
 }
 
 }