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

cc/layer_texture_updater.h

 // 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.
 
 
 #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 {
 
 class IntRect;
 class IntSize;
 class TextureManager;
 struct CCRenderingStats;
 class CCTextureUpdateQueue;
 
@@ skipping 26 matching lines @@
     enum SampledTexelFormat {
         SampledTexelFormatRGBA,
         SampledTexelFormatBGRA,
         SampledTexelFormatInvalid,
     };
     virtual PassOwnPtr<Texture> createTexture(CCPrioritizedTextureManager*) = 0;
     // Returns the format of the texel uploaded by this interface.
     // 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&) { }
 
     // Set true by the layer when it is known that the entire output is going to be opaque.
     virtual void setOpaque(bool) { }
 };
 
 } // namespace cc
 #endif // LayerTextureUpdater_h