cc: Remove wtf includes from resource provider

cc/tiled_layer_unittest.cc

 // Copyright 2011 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 "cc/tiled_layer.h"
 
 #include "CCOverdrawMetrics.h"
 #include "CCRenderingStats.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCTextureUpdateController.h"
 #include "cc/bitmap_canvas_layer_texture_updater.h"
 #include "cc/layer_painter.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_graphics_context.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/test/web_compositor_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace cc;
 using namespace WebKitTests;
-using namespace WTF;
 using WebKit::WebTransformationMatrix;
 
 namespace {
 
 class TestCCOcclusionTracker : public CCOcclusionTracker {
 public:
     TestCCOcclusionTracker()
         : CCOcclusionTracker(IntRect(0, 0, 1000, 1000), true)
         , m_layerClipRectInTarget(IntRect(0, 0, 1000, 1000))
     {
@@ skipping 20 matching lines @@
         , m_occlusion(0)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         m_resourceProvider = CCResourceProvider::create(m_context.get());
     }
 
     virtual ~TiledLayerChromiumTest()
     {
         textureManagerClearAllMemory(m_textureManager.get(), m_resourceProvider.get());
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
-        m_resourceProvider.clear();
+        m_resourceProvider.reset();
     }
 
     // Helper classes and functions that set the current thread to be the impl thread
     // before doing the action that they wrap.
     class ScopedFakeCCTiledLayerImpl {
     public:
         ScopedFakeCCTiledLayerImpl(int id)
         {
             DebugScopedSetImplThread implThread;
             m_layerImpl = new FakeCCTiledLayerImpl(id);
@@ skipping 76 matching lines @@
             layerPushPropertiesTo(layer1, layerImpl1);
         if (layer2)
             layerPushPropertiesTo(layer2, layerImpl2);
 
         return needsUpdate;
     }
 
 public:
     WebKitTests::WebCompositorInitializer m_compositorInitializer;
     scoped_ptr<CCGraphicsContext> m_context;
-    OwnPtr<CCResourceProvider> m_resourceProvider;
+    scoped_ptr<CCResourceProvider> m_resourceProvider;
     scoped_ptr<CCTextureUpdateQueue> m_queue;
     CCRenderingStats m_stats;
     FakeTextureUploader m_uploader;
     CCPriorityCalculator m_priorityCalculator;
     scoped_ptr<CCPrioritizedTextureManager> m_textureManager;
     TestCCOcclusionTracker* m_occlusion;
 };
 
 TEST_F(TiledLayerChromiumTest, pushDirtyTiles)
 {
@@ skipping 1375 matching lines @@
     updateTextures();
 
     // Invalidate the entire layer in layer space. When painting, the rect given to webkit should match the layer's bounds.
     layer->setNeedsDisplayRect(layerRect);
     layer->update(*m_queue.get(), 0, m_stats);
 
     EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect());
 }
 
 } // namespace