cc: Rename cc classes and members to match filenames

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 "cc/test/fake_graphics_context.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/test/web_compositor_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
 using namespace WebKitTests;
 
 namespace cc {
 
-class CCPrioritizedTextureTest : public testing::Test {
+class PrioritizedTextureTest : public testing::Test {
 public:
-    CCPrioritizedTextureTest()
+    PrioritizedTextureTest()
         : m_textureSize(256, 256)
         , m_textureFormat(GraphicsContext3D::RGBA)
         , m_compositorInitializer(0)
-        , m_context(WebKit::createFakeCCGraphicsContext())
+        , m_context(WebKit::createFakeGraphicsContext())
     {
         DebugScopedSetImplThread implThread;
-        m_resourceProvider = CCResourceProvider::create(m_context.get());
+        m_resourceProvider = ResourceProvider::create(m_context.get());
     }
 
-    virtual ~CCPrioritizedTextureTest()
+    virtual ~PrioritizedTextureTest()
     {
         DebugScopedSetImplThread implThread;
         m_resourceProvider.reset();
     }
 
     size_t texturesMemorySize(size_t textureCount)
     {
-        return CCTexture::memorySizeBytes(m_textureSize, m_textureFormat) * textureCount;
+        return Texture::memorySizeBytes(m_textureSize, m_textureFormat) * textureCount;
     }
 
-    scoped_ptr<CCPrioritizedTextureManager> createManager(size_t maxTextures)
+    scoped_ptr<PrioritizedTextureManager> createManager(size_t maxTextures)
     {
-        return CCPrioritizedTextureManager::create(texturesMemorySize(maxTextures), 1024, 0);
+        return PrioritizedTextureManager::create(texturesMemorySize(maxTextures), 1024, 0);
     }
 
-    bool validateTexture(scoped_ptr<CCPrioritizedTexture>& texture, bool requestLate)
+    bool validateTexture(scoped_ptr<PrioritizedTexture>& texture, bool requestLate)
     {
         textureManagerAssertInvariants(texture->textureManager());
         if (requestLate)
             texture->requestLate();
         textureManagerAssertInvariants(texture->textureManager());
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         bool success = texture->canAcquireBackingTexture();
         if (success)
             texture->acquireBackingTexture(resourceProvider());
         return success;
     }
 
-    void prioritizeTexturesAndBackings(CCPrioritizedTextureManager* textureManager)
+    void prioritizeTexturesAndBackings(PrioritizedTextureManager* textureManager)
     {
         textureManager->prioritizeTextures();
         textureManagerUpdateBackingsPriorities(textureManager);
     }
 
-    void textureManagerUpdateBackingsPriorities(CCPrioritizedTextureManager* textureManager)
+    void textureManagerUpdateBackingsPriorities(PrioritizedTextureManager* textureManager)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->pushTexturePrioritiesToBackings();
     }
 
-    CCResourceProvider* resourceProvider()
+    ResourceProvider* resourceProvider()
     {
        return m_resourceProvider.get();
     }
 
-    void textureManagerAssertInvariants(CCPrioritizedTextureManager* textureManager)
+    void textureManagerAssertInvariants(PrioritizedTextureManager* textureManager)
     {
 #if !ASSERT_DISABLED
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->assertInvariants();
 #endif
     }
 
-    bool textureBackingIsAbovePriorityCutoff(CCPrioritizedTexture* texture)
+    bool textureBackingIsAbovePriorityCutoff(PrioritizedTexture* texture)
     {
         return texture->m_backing->wasAbovePriorityCutoffAtLastPriorityUpdate();
     }
 
 protected:
     const IntSize m_textureSize;
     const GC3Denum m_textureFormat;
     WebCompositorInitializer m_compositorInitializer;
-    scoped_ptr<CCGraphicsContext> m_context;
-    scoped_ptr<CCResourceProvider> m_resourceProvider;
+    scoped_ptr<GraphicsContext> m_context;
+    scoped_ptr<ResourceProvider> m_resourceProvider;
 };
 
 }
 
 namespace {
 
-TEST_F(CCPrioritizedTextureTest, requestTextureExceedingMaxLimit)
+TEST_F(PrioritizedTextureTest, requestTextureExceedingMaxLimit)
 {
     const size_t maxTextures = 8;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
 
     // Create textures for double our memory limit.
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures*2];
+    scoped_ptr<PrioritizedTexture> textures[maxTextures*2];
 
     for (size_t i = 0; i < maxTextures*2; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // Set decreasing priorities
     for (size_t i = 0; i < maxTextures*2; ++i)
         textures[i]->setRequestPriority(100 + i);
 
     // Only lower half should be available.
     prioritizeTexturesAndBackings(textureManager.get());
@@ skipping 13 matching lines @@
     EXPECT_TRUE(validateTexture(textures[8], false));
     EXPECT_TRUE(validateTexture(textures[15], false));
 
     EXPECT_EQ(texturesMemorySize(maxTextures), textureManager->memoryAboveCutoffBytes());
     EXPECT_LE(textureManager->memoryUseBytes(), textureManager->memoryAboveCutoffBytes());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, changeMemoryLimits)
+TEST_F(PrioritizedTextureTest, changeMemoryLimits)
 {
     const size_t maxTextures = 8;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures];
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTexture> textures[maxTextures];
 
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i]->setRequestPriority(100 + i);
 
     // Set max limit to 8 textures
     textureManager->setMaxMemoryLimitBytes(texturesMemorySize(8));
     prioritizeTexturesAndBackings(textureManager.get());
     for (size_t i = 0; i < maxTextures; ++i)
@@ skipping 29 matching lines @@
         textureManager->reduceMemory(resourceProvider());
     }
 
     EXPECT_EQ(texturesMemorySize(4), textureManager->memoryAboveCutoffBytes());
     EXPECT_LE(textureManager->memoryUseBytes(), textureManager->memoryAboveCutoffBytes());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, textureManagerPartialUpdateTextures)
+TEST_F(PrioritizedTextureTest, textureManagerPartialUpdateTextures)
 {
     const size_t maxTextures = 4;
     const size_t numTextures = 4;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
-    scoped_ptr<CCPrioritizedTexture> textures[numTextures];
-    scoped_ptr<CCPrioritizedTexture> moreTextures[numTextures];
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTexture> textures[numTextures];
+    scoped_ptr<PrioritizedTexture> moreTextures[numTextures];
 
     for (size_t i = 0; i < numTextures; ++i) {
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
         moreTextures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
     }
 
     for (size_t i = 0; i < numTextures; ++i)
         textures[i]->setRequestPriority(200 + i);
     prioritizeTexturesAndBackings(textureManager.get());
 
@@ skipping 33 matching lines @@
     // Lower priority have been fully evicted.
     EXPECT_FALSE(textures[0]->haveBackingTexture());
     EXPECT_FALSE(textures[1]->haveBackingTexture());
     EXPECT_FALSE(textures[2]->haveBackingTexture());
     EXPECT_FALSE(textures[3]->haveBackingTexture());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, textureManagerPrioritiesAreEqual)
+TEST_F(PrioritizedTextureTest, textureManagerPrioritiesAreEqual)
 {
     const size_t maxTextures = 16;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures];
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTexture> textures[maxTextures];
 
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // All 16 textures have the same priority except 2 higher priority.
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i]->setRequestPriority(100);
     textures[0]->setRequestPriority(99);
     textures[1]->setRequestPriority(99);
 
@@ skipping 15 matching lines @@
         EXPECT_TRUE(validateTexture(textures[i], true));
     for (size_t i = 9; i < maxTextures; i++)
         EXPECT_FALSE(validateTexture(textures[i], true));
     EXPECT_EQ(texturesMemorySize(8), textureManager->memoryAboveCutoffBytes());
     EXPECT_LE(textureManager->memoryUseBytes(), textureManager->memoryAboveCutoffBytes());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, textureManagerDestroyedFirst)
+TEST_F(PrioritizedTextureTest, textureManagerDestroyedFirst)
 {
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(1);
-    scoped_ptr<CCPrioritizedTexture> texture = textureManager->createTexture(m_textureSize, m_textureFormat);
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(1);
+    scoped_ptr<PrioritizedTexture> texture = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // Texture is initially invalid, but it will become available.
     EXPECT_FALSE(texture->haveBackingTexture());
 
     texture->setRequestPriority(100);
     prioritizeTexturesAndBackings(textureManager.get());
 
     EXPECT_TRUE(validateTexture(texture, false));
     EXPECT_TRUE(texture->canAcquireBackingTexture());
     EXPECT_TRUE(texture->haveBackingTexture());
 
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->clearAllMemory(resourceProvider());
     }
     textureManager.reset();
 
     EXPECT_FALSE(texture->canAcquireBackingTexture());
     EXPECT_FALSE(texture->haveBackingTexture());
 }
 
-TEST_F(CCPrioritizedTextureTest, textureMovedToNewManager)
+TEST_F(PrioritizedTextureTest, textureMovedToNewManager)
 {
-    scoped_ptr<CCPrioritizedTextureManager> textureManagerOne = createManager(1);
-    scoped_ptr<CCPrioritizedTextureManager> textureManagerTwo = createManager(1);
-    scoped_ptr<CCPrioritizedTexture> texture = textureManagerOne->createTexture(m_textureSize, m_textureFormat);
+    scoped_ptr<PrioritizedTextureManager> textureManagerOne = createManager(1);
+    scoped_ptr<PrioritizedTextureManager> textureManagerTwo = createManager(1);
+    scoped_ptr<PrioritizedTexture> texture = textureManagerOne->createTexture(m_textureSize, m_textureFormat);
 
     // Texture is initially invalid, but it will become available.
     EXPECT_FALSE(texture->haveBackingTexture());
 
     texture->setRequestPriority(100);
     prioritizeTexturesAndBackings(textureManagerOne.get());
 
     EXPECT_TRUE(validateTexture(texture, false));
     EXPECT_TRUE(texture->canAcquireBackingTexture());
     EXPECT_TRUE(texture->haveBackingTexture());
@@ skipping 14 matching lines @@
     prioritizeTexturesAndBackings(textureManagerTwo.get());
 
     EXPECT_TRUE(validateTexture(texture, false));
     EXPECT_TRUE(texture->canAcquireBackingTexture());
     EXPECT_TRUE(texture->haveBackingTexture());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManagerTwo->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, renderSurfacesReduceMemoryAvailableOutsideRootSurface)
+TEST_F(PrioritizedTextureTest, renderSurfacesReduceMemoryAvailableOutsideRootSurface)
 {
     const size_t maxTextures = 8;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
 
     // Half of the memory is taken by surfaces (with high priority place-holder)
-    scoped_ptr<CCPrioritizedTexture> renderSurfacePlaceHolder = textureManager->createTexture(m_textureSize, m_textureFormat);
+    scoped_ptr<PrioritizedTexture> renderSurfacePlaceHolder = textureManager->createTexture(m_textureSize, m_textureFormat);
     renderSurfacePlaceHolder->setToSelfManagedMemoryPlaceholder(texturesMemorySize(4));
-    renderSurfacePlaceHolder->setRequestPriority(CCPriorityCalculator::renderSurfacePriority());
+    renderSurfacePlaceHolder->setRequestPriority(PriorityCalculator::renderSurfacePriority());
 
     // Create textures to fill our memory limit.
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures];
+    scoped_ptr<PrioritizedTexture> textures[maxTextures];
 
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // Set decreasing non-visible priorities outside root surface.
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i]->setRequestPriority(100 + i);
 
     // Only lower half should be available.
     prioritizeTexturesAndBackings(textureManager.get());
@@ skipping 14 matching lines @@
     EXPECT_TRUE(validateTexture(textures[7], false));
 
     EXPECT_EQ(texturesMemorySize(4), textureManager->memoryAboveCutoffBytes());
     EXPECT_EQ(texturesMemorySize(4), textureManager->memoryForSelfManagedTextures());
     EXPECT_LE(textureManager->memoryUseBytes(), textureManager->memoryAboveCutoffBytes());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, renderSurfacesReduceMemoryAvailableForRequestLate)
+TEST_F(PrioritizedTextureTest, renderSurfacesReduceMemoryAvailableForRequestLate)
 {
     const size_t maxTextures = 8;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
 
     // Half of the memory is taken by surfaces (with high priority place-holder)
-    scoped_ptr<CCPrioritizedTexture> renderSurfacePlaceHolder = textureManager->createTexture(m_textureSize, m_textureFormat);
+    scoped_ptr<PrioritizedTexture> renderSurfacePlaceHolder = textureManager->createTexture(m_textureSize, m_textureFormat);
     renderSurfacePlaceHolder->setToSelfManagedMemoryPlaceholder(texturesMemorySize(4));
-    renderSurfacePlaceHolder->setRequestPriority(CCPriorityCalculator::renderSurfacePriority());
+    renderSurfacePlaceHolder->setRequestPriority(PriorityCalculator::renderSurfacePriority());
 
     // Create textures to fill our memory limit.
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures];
+    scoped_ptr<PrioritizedTexture> textures[maxTextures];
 
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // Set equal priorities.
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i]->setRequestPriority(100);
 
     // The first four to be requested late will be available.
     prioritizeTexturesAndBackings(textureManager.get());
     for (unsigned i = 0; i < maxTextures; ++i)
         EXPECT_FALSE(validateTexture(textures[i], false));
     for (unsigned i = 0; i < maxTextures; i += 2)
         EXPECT_TRUE(validateTexture(textures[i], true));
     for (unsigned i = 1; i < maxTextures; i += 2)
         EXPECT_FALSE(validateTexture(textures[i], true));
 
     EXPECT_EQ(texturesMemorySize(4), textureManager->memoryAboveCutoffBytes());
     EXPECT_EQ(texturesMemorySize(4), textureManager->memoryForSelfManagedTextures());
     EXPECT_LE(textureManager->memoryUseBytes(), textureManager->memoryAboveCutoffBytes());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, whenRenderSurfaceNotAvailableTexturesAlsoNotAvailable)
+TEST_F(PrioritizedTextureTest, whenRenderSurfaceNotAvailableTexturesAlsoNotAvailable)
 {
     const size_t maxTextures = 8;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
 
     // Half of the memory is taken by surfaces (with high priority place-holder)
-    scoped_ptr<CCPrioritizedTexture> renderSurfacePlaceHolder = textureManager->createTexture(m_textureSize, m_textureFormat);
+    scoped_ptr<PrioritizedTexture> renderSurfacePlaceHolder = textureManager->createTexture(m_textureSize, m_textureFormat);
     renderSurfacePlaceHolder->setToSelfManagedMemoryPlaceholder(texturesMemorySize(4));
-    renderSurfacePlaceHolder->setRequestPriority(CCPriorityCalculator::renderSurfacePriority());
+    renderSurfacePlaceHolder->setRequestPriority(PriorityCalculator::renderSurfacePriority());
 
     // Create textures to fill our memory limit.
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures];
+    scoped_ptr<PrioritizedTexture> textures[maxTextures];
 
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // Set 6 visible textures in the root surface, and 2 in a child surface.
     for (size_t i = 0; i < 6; ++i)
-        textures[i]->setRequestPriority(CCPriorityCalculator::visiblePriority(true));
+        textures[i]->setRequestPriority(PriorityCalculator::visiblePriority(true));
     for (size_t i = 6; i < 8; ++i)
-        textures[i]->setRequestPriority(CCPriorityCalculator::visiblePriority(false));
+        textures[i]->setRequestPriority(PriorityCalculator::visiblePriority(false));
 
     prioritizeTexturesAndBackings(textureManager.get());
 
     // Unable to requestLate textures in the child surface.
     EXPECT_FALSE(validateTexture(textures[6], true));
     EXPECT_FALSE(validateTexture(textures[7], true));
 
     // Root surface textures are valid.
     for (size_t i = 0; i < 6; ++i)
         EXPECT_TRUE(validateTexture(textures[i], false));
 
     EXPECT_EQ(texturesMemorySize(6), textureManager->memoryAboveCutoffBytes());
     EXPECT_EQ(texturesMemorySize(2), textureManager->memoryForSelfManagedTextures());
     EXPECT_LE(textureManager->memoryUseBytes(), textureManager->memoryAboveCutoffBytes());
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, requestLateBackingsSorting)
+TEST_F(PrioritizedTextureTest, requestLateBackingsSorting)
 {
     const size_t maxTextures = 8;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager = createManager(maxTextures);
+    scoped_ptr<PrioritizedTextureManager> textureManager = createManager(maxTextures);
     textureManager->setMaxMemoryLimitBytes(texturesMemorySize(maxTextures));
 
     // Create textures to fill our memory limit.
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures];
+    scoped_ptr<PrioritizedTexture> textures[maxTextures];
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // Set equal priorities, and allocate backings for all textures.
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i]->setRequestPriority(100);
     prioritizeTexturesAndBackings(textureManager.get());
     for (unsigned i = 0; i < maxTextures; ++i)
         EXPECT_TRUE(validateTexture(textures[i], false));
 
@@ skipping 20 matching lines @@
     // Make sure that only the requestLate textures are above the priority cutoff
     for (size_t i = 0; i < maxTextures; i += 2)
         EXPECT_TRUE(textureBackingIsAbovePriorityCutoff(textures[i].get()));
     for (size_t i = 1; i < maxTextures; i += 2)
         EXPECT_FALSE(textureBackingIsAbovePriorityCutoff(textures[i].get()));
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
-TEST_F(CCPrioritizedTextureTest, clearUploadsToEvictedResources)
+TEST_F(PrioritizedTextureTest, clearUploadsToEvictedResources)
 {
     const size_t maxTextures = 4;
-    scoped_ptr<CCPrioritizedTextureManager> textureManager =
+    scoped_ptr<PrioritizedTextureManager> textureManager =
         createManager(maxTextures);
     textureManager->setMaxMemoryLimitBytes(texturesMemorySize(maxTextures));
 
     // Create textures to fill our memory limit.
-    scoped_ptr<CCPrioritizedTexture> textures[maxTextures];
+    scoped_ptr<PrioritizedTexture> textures[maxTextures];
 
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i] = textureManager->createTexture(m_textureSize, m_textureFormat);
 
     // Set equal priorities, and allocate backings for all textures.
     for (size_t i = 0; i < maxTextures; ++i)
         textures[i]->setRequestPriority(100);
     prioritizeTexturesAndBackings(textureManager.get());
     for (unsigned i = 0; i < maxTextures; ++i)
         EXPECT_TRUE(validateTexture(textures[i], false));
 
-    CCTextureUpdateQueue queue;
+    TextureUpdateQueue queue;
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     for (size_t i = 0; i < maxTextures; ++i) {
         const TextureUploader::Parameters upload = { textures[i].get() };
         queue.appendFullUpload(upload);
     }
 
     // Make sure that we have backings for all of the textures.
     for (size_t i = 0; i < maxTextures; ++i)
         EXPECT_TRUE(textures[i]->haveBackingTexture());
 
     queue.clearUploadsToEvictedResources();
     EXPECT_EQ(4, queue.fullUploadSize());
 
     textureManager->reduceMemoryOnImplThread(
         texturesMemorySize(1), resourceProvider());
     queue.clearUploadsToEvictedResources();
     EXPECT_EQ(1, queue.fullUploadSize());
 
     textureManager->reduceMemoryOnImplThread(0, resourceProvider());
     queue.clearUploadsToEvictedResources();
     EXPECT_EQ(0, queue.fullUploadSize());
 
 }
 
 } // namespace