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

cc/prioritized_texture_unittest.cc

 // 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.
 
 #include "config.h"
 
 #include "CCPrioritizedTexture.h"
 
 #include "CCPrioritizedTextureManager.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCTexture.h"
 #include "CCTiledLayerTestCommon.h"
 #include "FakeCCGraphicsContext.h"
 #include "WebCompositorInitializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
 using namespace WebKitTests;
 using namespace WTF;
 
 namespace cc {
 
 class CCPrioritizedTextureTest : public testing::Test {
 public:
     CCPrioritizedTextureTest()
         : m_textureSize(256, 256)
-        , m_textureFormat(GraphicsContext3D::RGBA)
+        , m_textureFormat(GL_RGBA)
         , m_compositorInitializer(0)
         , m_context(WebKit::createFakeCCGraphicsContext())
     {
         DebugScopedSetImplThread implThread;
         m_resourceProvider = CCResourceProvider::create(m_context.get());
     }
 
     virtual ~CCPrioritizedTextureTest()
     {
         DebugScopedSetImplThread implThread;
@@ skipping 48 matching lines @@
 #endif
     }
 
     bool textureBackingIsAbovePriorityCutoff(CCPrioritizedTexture* texture)
     {
         return texture->m_backing->wasAbovePriorityCutoffAtLastPriorityUpdate();
     }
 
 protected:
     const IntSize m_textureSize;
-    const GC3Denum m_textureFormat;
+    const GLenum m_textureFormat;
     WebCompositorInitializer m_compositorInitializer;
     scoped_ptr<CCGraphicsContext> m_context;
     OwnPtr<CCResourceProvider> m_resourceProvider;
 };
 
 }
 
 namespace {
 
 TEST_F(CCPrioritizedTextureTest, requestTextureExceedingMaxLimit)
@@ skipping 464 matching lines @@
     queue.clearUploadsToEvictedResources();
     EXPECT_EQ(1, queue.fullUploadSize());
 
     textureManager->reduceMemoryOnImplThread(0, resourceProvider());
     queue.clearUploadsToEvictedResources();
     EXPECT_EQ(0, queue.fullUploadSize());
 
 }
 
 } // namespace