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

cc/prioritized_texture.h

 // Copyright 2012 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 CCPrioritizedTexture_h
 #define CCPrioritizedTexture_h
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "CCPriorityCalculator.h"
 #include "CCResourceProvider.h"
 #include "CCTexture.h"
-#include "GraphicsContext3D.h"
 #include "IntRect.h"
 #include "IntSize.h"
 
 namespace cc {
 
 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));
     }
     static scoped_ptr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager)
     {
         return make_scoped_ptr(new CCPrioritizedTexture(manager, IntSize(), 0));
     }
     ~CCPrioritizedTexture();
 
     // Texture properties. Changing these causes the backing texture to be lost.
     // 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; }
 
     // Set priority for the requested texture. 
     void setRequestPriority(int priority) { m_priority = priority; }
     int requestPriority() const { return m_priority; }
 
     // After CCPrioritizedTexture::prioritizeTextures() is called, this returns
     // if the the request succeeded and this texture can be acquired for use.
     bool canAcquireBackingTexture() const { return m_isAbovePriorityCutoff; }
@@ skipping 31 matching lines @@
     void setIsSelfManaged(bool isSelfManaged) { m_isSelfManaged = isSelfManaged; }
     bool isSelfManaged() { return m_isSelfManaged; }
     void setToSelfManagedMemoryPlaceholder(size_t bytes);
 
 private:
     friend class CCPrioritizedTextureManager;
     friend class CCPrioritizedTextureTest;
 
     class Backing : public CCTexture {
     public:
-        Backing(unsigned id, CCResourceProvider*, IntSize, GC3Denum format);
+        Backing(unsigned id, CCResourceProvider*, IntSize, GLenum format);
         ~Backing();
         void updatePriority();
         void updateInDrawingImplTree();
 
         CCPrioritizedTexture* owner() { return m_owner; }
         bool canBeRecycled() const;
         int requestPriorityAtLastPriorityUpdate() const { return m_priorityAtLastPriorityUpdate; }
         bool wasAbovePriorityCutoffAtLastPriorityUpdate() const { return m_wasAbovePriorityCutoffAtLastPriorityUpdate; }
         bool inDrawingImplTree() const { return m_inDrawingImplTree; }
 
@@ skipping 10 matching lines @@
         bool m_inDrawingImplTree;
 
         bool m_resourceHasBeenDeleted;
 #ifndef NDEBUG
         CCResourceProvider* m_resourceProvider;
 #endif
 
         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; }
     void setManagerInternal(CCPrioritizedTextureManager* manager) { m_manager = manager; }
 
     Backing* backing() const { return m_backing; }
     void link(Backing*);
     void unlink();
 
     IntSize m_size;
-    GC3Denum m_format;
+    GLenum m_format;
     size_t m_bytes;
 
     int m_priority;
     bool m_isAbovePriorityCutoff;
     bool m_isSelfManaged;
 
     Backing* m_backing;
     CCPrioritizedTextureManager* m_manager;
 
     DISALLOW_COPY_AND_ASSIGN(CCPrioritizedTexture);
 };
 
 }  // namespace cc
 
 #endif