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

cc/layer_texture_updater.h

Index: cc/layer_texture_updater.h
diff --git a/cc/layer_texture_updater.h b/cc/layer_texture_updater.h
index 7ded543a16f222617800ee7fa8ec26427c00f684..572edffd35477fec0f086a394cfe5490e07dca92 100644
--- a/cc/layer_texture_updater.h
+++ b/cc/layer_texture_updater.h
@@ -6,8 +6,8 @@
 #ifndef LayerTextureUpdater_h
 #define LayerTextureUpdater_h
 
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCPrioritizedTexture.h"
-#include "GraphicsTypes3D.h"
 #include <wtf/RefCounted.h>
 
 namespace cc {
@@ -54,7 +54,7 @@ public:
     // This format should not be confused by texture internal format.
     // This format specifies the component order in the sampled texel.
     // If the format is TexelFormatBGRA, vec4.x is blue and vec4.z is red.
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) = 0;
+    virtual SampledTexelFormat sampledTexelFormat(GLenum textureFormat) = 0;
     // The |resultingOpaqueRect| gives back a region of the layer that was painted opaque. If the layer is marked opaque in the updater,
     // then this region should be ignored in preference for the entire layer's area.
     virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats&) { }