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

cc/texture.h

Index: cc/texture.h
diff --git a/cc/texture.h b/cc/texture.h
index 8d0def354495aab9e2cf023a8781a6bec9c03cdf..d2e30cd5d5049d1e7dae90dc0aa9abf7c048a133 100644
--- a/cc/texture.h
+++ b/cc/texture.h
@@ -5,9 +5,9 @@
 #ifndef CCTexture_h
 #define CCTexture_h
 
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCResourceProvider.h"
 #include "CCTexture.h"
-#include "GraphicsContext3D.h"
 #include "IntSize.h"
 
 namespace cc {
@@ -15,26 +15,26 @@ namespace cc {
 class CCTexture {
 public:
     CCTexture() : m_id(0) { }
-    CCTexture(unsigned id, IntSize size, GC3Denum format)
+    CCTexture(unsigned id, IntSize size, GLenum format)
         : m_id(id)
         , m_size(size)
         , m_format(format) { }
 
     CCResourceProvider::ResourceId id() const { return m_id; }
     const IntSize& size() const { return m_size; }
-    GC3Denum format() const { return m_format; }
+    GLenum format() const { return m_format; }
 
     void setId(CCResourceProvider::ResourceId id) { m_id = id; }
-    void setDimensions(const IntSize&, GC3Denum format);
+    void setDimensions(const IntSize&, GLenum format);
 
     size_t bytes() const;
 
-    static size_t memorySizeBytes(const IntSize&, GC3Denum format);
+    static size_t memorySizeBytes(const IntSize&, GLenum format);
 
 private:
     CCResourceProvider::ResourceId m_id;
     IntSize m_size;
-    GC3Denum m_format;
+    GLenum m_format;
 };
 
 }