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

cc/prioritized_texture.h

Index: cc/prioritized_texture.h
diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h
index 242147c2a8b82bedb313e8d1ff768cacafe75da0..735efe510e78aa1c252f125546d54184b6fbb2e4 100644
--- a/cc/prioritized_texture.h
+++ b/cc/prioritized_texture.h
@@ -10,7 +10,6 @@
 #include "CCPriorityCalculator.h"
 #include "CCResourceProvider.h"
 #include "CCTexture.h"
-#include "GraphicsContext3D.h"
 #include "IntRect.h"
 #include "IntSize.h"
 
@@ -20,7 +19,7 @@ class CCPrioritizedTextureManager;
 
 class CCPrioritizedTexture {
 public:
-    static scoped_ptr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager, IntSize size, GC3Denum format)
+    static scoped_ptr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager, IntSize size, GLenum format)
     {
         return make_scoped_ptr(new CCPrioritizedTexture(manager, size, format));
     }
@@ -34,8 +33,8 @@ public:
     // Setting these to the same value is a no-op.
     void setTextureManager(CCPrioritizedTextureManager*);
     CCPrioritizedTextureManager* textureManager() { return m_manager; }
-    void setDimensions(IntSize, GC3Denum format);
-    GC3Denum format() const { return m_format; }
+    void setDimensions(IntSize, GLenum format);
+    GLenum format() const { return m_format; }
     IntSize size() const { return m_size; }
     size_t bytes() const { return m_bytes; }
 
@@ -87,7 +86,7 @@ private:
 
     class Backing : public CCTexture {
     public:
-        Backing(unsigned id, CCResourceProvider*, IntSize, GC3Denum format);
+        Backing(unsigned id, CCResourceProvider*, IntSize, GLenum format);
         ~Backing();
         void updatePriority();
         void updateInDrawingImplTree();
@@ -118,7 +117,7 @@ private:
         DISALLOW_COPY_AND_ASSIGN(Backing);
     };
 
-    CCPrioritizedTexture(CCPrioritizedTextureManager*, IntSize, GC3Denum format);
+    CCPrioritizedTexture(CCPrioritizedTextureManager*, IntSize, GLenum format);
 
     bool isAbovePriorityCutoff() { return m_isAbovePriorityCutoff; }
     void setAbovePriorityCutoff(bool isAbovePriorityCutoff) { m_isAbovePriorityCutoff = isAbovePriorityCutoff; }
@@ -129,7 +128,7 @@ private:
     void unlink();
 
     IntSize m_size;
-    GC3Denum m_format;
+    GLenum m_format;
     size_t m_bytes;
 
     int m_priority;