From a7aa5567e237f78e02defb0dfbe59c7690af5c23 Mon Sep 17 00:00:00 2001
From: "enne@chromium.org"
 <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 17 Oct 2012 14:12:44 +0000
Subject: cc: Remove wtf includes from resource provider

R=jamesr@chromium.org
BUG=154451


Review URL: https://chromiumcodereview.appspot.com/11183006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162393 0039d316-1c4b-4281-b951-d872f2087c98
---
 cc/tiled_layer_unittest.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'cc/tiled_layer_unittest.cc')

diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 11c4acc..0f45c5a 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -23,7 +23,6 @@
 
 using namespace cc;
 using namespace WebKitTests;
-using namespace WTF;
 using WebKit::WebTransformationMatrix;
 
 namespace {
@@ -64,7 +63,7 @@ public:
     {
         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
@@ -161,7 +160,7 @@ public:
 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;
-- 
cgit v1.1