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

cc/layer_tree_host_unittest.cc

 // Copyright 2011 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 "CCLayerTreeHost.h"
 
+#include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
 #include "CCGeometryTestUtils.h"
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCOcclusionTrackerTestCommon.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
 #include "CCTextureUpdateQueue.h"
 #include "CCThreadedTest.h"
 #include "CCTimingFunction.h"
 #include "ContentLayerChromium.h"
 #include "ContentLayerChromiumClient.h"
-#include "Extensions3DChromium.h"
 #include "FakeWebCompositorOutputSurface.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include <public/Platform.h>
 #include <public/WebLayerScrollClient.h>
 #include <public/WebSize.h>
 #include <wtf/OwnArrayPtr.h>
 
 using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
 namespace {
@@ skipping 2380 matching lines @@
 
 private:
     EvictionTestLayer() : LayerChromium() { }
     virtual ~EvictionTestLayer() { }
 
     void createTextureIfNeeded()
     {
         if (m_texture.get())
             return;
         m_texture = CCPrioritizedTexture::create(layerTreeHost()->contentsTextureManager());
-        m_texture->setDimensions(IntSize(10, 10), cc::GraphicsContext3D::RGBA);
+        m_texture->setDimensions(IntSize(10, 10), GL_RGBA);
         m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
     }
 
     scoped_ptr<CCPrioritizedTexture> m_texture;
     SkBitmap m_bitmap;
 };
 
 class EvictionTestLayerImpl : public CCLayerImpl {
 public:
     static scoped_ptr<EvictionTestLayerImpl> create(int id)
@@ skipping 283 matching lines @@
 class CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext : public WebKit::CompositorFakeWebGraphicsContext3D {
 public:
     static PassOwnPtr<CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext> create(Attributes attrs)
     {
         return adoptPtr(new CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext(attrs));
     }
 
     virtual void setContextLostCallback(WebGraphicsContextLostCallback* callback) { m_contextLostCallback = callback; }
     virtual bool isContextLost() { return m_isContextLost; }
 
-    virtual void beginQueryEXT(GC3Denum, WebGLId) { }
-    virtual void endQueryEXT(GC3Denum)
+    virtual void beginQueryEXT(WGC3Denum, WebGLId) { }
+    virtual void endQueryEXT(WGC3Denum)
     {
         // Lose context.
         if (!m_isContextLost) {
             m_contextLostCallback->onContextLost();
             m_isContextLost = true;
         }
     }
-    virtual void getQueryObjectuivEXT(WebGLId, GC3Denum pname, GC3Duint* params)
+    virtual void getQueryObjectuivEXT(WebGLId, WGC3Denum pname, WGC3Duint* params)
     {
         // Context is lost. We need to behave as if result is available.
-        if (pname == Extensions3DChromium::QUERY_RESULT_AVAILABLE_EXT)
+        if (pname == GL_QUERY_RESULT_AVAILABLE_EXT)
             *params = 1;
     }
 
 private:
     explicit CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext(Attributes attrs)
         : CompositorFakeWebGraphicsContext3D(attrs)
         , m_contextLostCallback(0)
         , m_isContextLost(false) { }
 
     WebGraphicsContextLostCallback* m_contextLostCallback;
@@ skipping 217 matching lines @@
     int m_numCommitComplete;
     int m_numDrawLayers;
 };
 
 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread)
 {
     runTest(true);
 }
 
 } // namespace