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

cc/prioritized_texture_manager.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 CCPrioritizedTextureManager_h
 #define CCPrioritizedTextureManager_h
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "CCPrioritizedTexture.h"
 #include "CCPriorityCalculator.h"
 #include "CCTexture.h"
-#include "GraphicsContext3D.h"
 #include "IntRect.h"
 #include "IntSize.h"
 #include <wtf/ListHashSet.h>
 #include <wtf/Vector.h>
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 template<>
 struct hash<cc::CCPrioritizedTexture*> {
   size_t operator()(cc::CCPrioritizedTexture* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 } // namespace BASE_HASH_NAMESPACE
 #endif // COMPILER
 
 namespace cc {
 
 class CCPriorityCalculator;
 
 class CCPrioritizedTextureManager {
 public:
     static scoped_ptr<CCPrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool)
     {
         return make_scoped_ptr(new CCPrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool));
     }
-    scoped_ptr<CCPrioritizedTexture> createTexture(IntSize size, GC3Denum format)
+    scoped_ptr<CCPrioritizedTexture> createTexture(IntSize size, GLenum format)
     {
         return make_scoped_ptr(new CCPrioritizedTexture(this, size, format));
     }
     ~CCPrioritizedTextureManager();
 
     typedef Vector<CCPrioritizedTexture::Backing*> BackingVector;
 
     // FIXME (http://crbug.com/137094): This 64MB default is a straggler from the
     // old texture manager and is just to give us a default memory allocation before
     // we get a callback from the GPU memory manager. We should probaby either:
@@ skipping 76 matching lines @@
             return CCPriorityCalculator::priorityIsLower(a->requestPriorityAtLastPriorityUpdate(), b->requestPriorityAtLastPriorityUpdate());
         // Finally sort by being in the impl tree versus being completely unreferenced
         if (a->inDrawingImplTree() != b->inDrawingImplTree())
             return (a->inDrawingImplTree() < b->inDrawingImplTree());
         return a < b;
     }
 
     CCPrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool);
 
     void evictBackingsToReduceMemory(size_t limitBytes, EvictionPriorityPolicy, CCResourceProvider*);
-    CCPrioritizedTexture::Backing* createBacking(IntSize, GC3Denum format, CCResourceProvider*);
+    CCPrioritizedTexture::Backing* createBacking(IntSize, GLenum format, CCResourceProvider*);
     void evictBackingResource(CCPrioritizedTexture::Backing*, CCResourceProvider*);
     void deleteUnlinkedEvictedBackings();
     void sortBackings();
 
 #if !ASSERT_DISABLED
     void assertInvariants();
 #endif
 
     size_t m_maxMemoryLimitBytes;
     unsigned m_priorityCutoff;
@@ skipping 12 matching lines @@
 
     TextureVector m_tempTextureVector;
     BackingVector m_tempBackingVector;
 
     DISALLOW_COPY_AND_ASSIGN(CCPrioritizedTextureManager);
 };
 
 }  // namespace cc
 
 #endif