1 files changed, 25 insertions, 25 deletions

diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 844688e..1c0f75d 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -20,16 +20,16 @@
 
 namespace WebKitTests {
 
-class FakeTiledLayerChromium;
+class FakeTiledLayer;
 
 class FakeLayerTextureUpdater : public cc::LayerTextureUpdater {
 public:
     class Texture : public cc::LayerTextureUpdater::Texture {
     public:
-        Texture(FakeLayerTextureUpdater*, scoped_ptr<cc::CCPrioritizedTexture>);
+        Texture(FakeLayerTextureUpdater*, scoped_ptr<cc::PrioritizedTexture>);
         virtual ~Texture();
 
-        virtual void update(cc::CCTextureUpdateQueue&, const cc::IntRect&, const cc::IntSize&, bool, cc::CCRenderingStats&) OVERRIDE;
+        virtual void update(cc::TextureUpdateQueue&, const cc::IntRect&, const cc::IntSize&, bool, cc::RenderingStats&) OVERRIDE;
 
     private:
         FakeLayerTextureUpdater* m_layer;
@@ -38,13 +38,13 @@ public:
 
     FakeLayerTextureUpdater();
 
-    virtual scoped_ptr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
+    virtual scoped_ptr<cc::LayerTextureUpdater::Texture> createTexture(cc::PrioritizedTextureManager*) OVERRIDE;
     virtual SampledTexelFormat sampledTexelFormat(GLenum) OVERRIDE;
 
-    virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) OVERRIDE;
+    virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::RenderingStats&) OVERRIDE;
     // Sets the rect to invalidate during the next call to prepareToUpdate(). After the next
     // call to prepareToUpdate() the rect is reset.
-    void setRectToInvalidate(const cc::IntRect&, FakeTiledLayerChromium*);
+    void setRectToInvalidate(const cc::IntRect&, FakeTiledLayer*);
     // Last rect passed to prepareToUpdate().
     const cc::IntRect& lastUpdateRect()  const { return m_lastUpdateRect; }
 
@@ -68,53 +68,53 @@ private:
     cc::IntRect m_rectToInvalidate;
     cc::IntRect m_lastUpdateRect;
     cc::IntRect m_opaquePaintRect;
-    scoped_refptr<FakeTiledLayerChromium> m_layer;
+    scoped_refptr<FakeTiledLayer> m_layer;
 };
 
-class FakeCCTiledLayerImpl : public cc::CCTiledLayerImpl {
+class FakeTiledLayerImpl : public cc::TiledLayerImpl {
 public:
-    explicit FakeCCTiledLayerImpl(int id);
-    virtual ~FakeCCTiledLayerImpl();
+    explicit FakeTiledLayerImpl(int id);
+    virtual ~FakeTiledLayerImpl();
 
-    using cc::CCTiledLayerImpl::hasTileAt;
-    using cc::CCTiledLayerImpl::hasResourceIdForTileAt;
+    using cc::TiledLayerImpl::hasTileAt;
+    using cc::TiledLayerImpl::hasResourceIdForTileAt;
 };
 
-class FakeTiledLayerChromium : public cc::TiledLayerChromium {
+class FakeTiledLayer : public cc::TiledLayer {
 public:
-    explicit FakeTiledLayerChromium(cc::CCPrioritizedTextureManager*);
+    explicit FakeTiledLayer(cc::PrioritizedTextureManager*);
 
     static cc::IntSize tileSize() { return cc::IntSize(100, 100); }
 
-    using cc::TiledLayerChromium::invalidateContentRect;
-    using cc::TiledLayerChromium::needsIdlePaint;
-    using cc::TiledLayerChromium::skipsDraw;
-    using cc::TiledLayerChromium::numPaintedTiles;
-    using cc::TiledLayerChromium::idlePaintRect;
+    using cc::TiledLayer::invalidateContentRect;
+    using cc::TiledLayer::needsIdlePaint;
+    using cc::TiledLayer::skipsDraw;
+    using cc::TiledLayer::numPaintedTiles;
+    using cc::TiledLayer::idlePaintRect;
 
     virtual void setNeedsDisplayRect(const cc::FloatRect&) OVERRIDE;
     const cc::FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
 
-    virtual void setTexturePriorities(const cc::CCPriorityCalculator&) OVERRIDE;
+    virtual void setTexturePriorities(const cc::PriorityCalculator&) OVERRIDE;
 
-    virtual cc::CCPrioritizedTextureManager* textureManager() const OVERRIDE;
+    virtual cc::PrioritizedTextureManager* textureManager() const OVERRIDE;
     FakeLayerTextureUpdater* fakeLayerTextureUpdater() { return m_fakeTextureUpdater.get(); }
     cc::FloatRect updateRect() { return m_updateRect; }
 
 protected:
     virtual cc::LayerTextureUpdater* textureUpdater() const OVERRIDE;
     virtual void createTextureUpdaterIfNeeded() OVERRIDE { }
-    virtual ~FakeTiledLayerChromium();
+    virtual ~FakeTiledLayer();
 
 private:
     scoped_refptr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
-    cc::CCPrioritizedTextureManager* m_textureManager;
+    cc::PrioritizedTextureManager* m_textureManager;
     cc::FloatRect m_lastNeedsDisplayRect;
 };
 
-class FakeTiledLayerWithScaledBounds : public FakeTiledLayerChromium {
+class FakeTiledLayerWithScaledBounds : public FakeTiledLayer {
 public:
-    explicit FakeTiledLayerWithScaledBounds(cc::CCPrioritizedTextureManager*);
+    explicit FakeTiledLayerWithScaledBounds(cc::PrioritizedTextureManager*);
 
     void setContentBounds(const cc::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; }
     virtual cc::IntSize contentBounds() const OVERRIDE;