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

cc/throttled_texture_uploader_unittest.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 "CCPrioritizedTexture.h"
-#include "Extensions3DChromium.h"
 #include "FakeWebGraphicsContext3D.h"
-#include "GraphicsContext3D.h"
-
+#include "third_party/khronos/GLES2/gl2ext.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "FakeWebGraphicsContext3D.h"
 #include <wtf/RefPtr.h>
 
 using namespace cc;
 using namespace WebKit;
 
 namespace {
 
 class FakeWebGraphicsContext3DWithQueryTesting : public FakeWebGraphicsContext3D {
 public:
     FakeWebGraphicsContext3DWithQueryTesting() : m_resultAvailable(0)
     {
     }
 
-    virtual void getQueryObjectuivEXT(WebGLId, GC3Denum type, GC3Duint* value)
+    virtual void getQueryObjectuivEXT(WebGLId, WGC3Denum type, WGC3Duint* value)
     {
         switch (type) {
-        case Extensions3DChromium::QUERY_RESULT_AVAILABLE_EXT:
+        case GL_QUERY_RESULT_AVAILABLE_EXT:
             *value = m_resultAvailable;
             break;
         default:
             *value = 0;
             break;
         }
     }
 
     void setResultAvailable(unsigned resultAvailable) { m_resultAvailable = resultAvailable; }
 
@@ skipping 58 matching lines @@
     EXPECT_EQ(1, uploader->numBlockingUploads());
 
     fakeContext->setResultAvailable(1);
     EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     uploader->markPendingUploadsAsNonBlocking();
     EXPECT_EQ(0, uploader->numBlockingUploads());
 }
 
 } // namespace