From 2d86b9236f5c502d9bf33aeb33e1fc865fb19914 Mon Sep 17 00:00:00 2001
From: "tfarina@chromium.org"
 <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 13 Oct 2012 16:57:47 +0000
Subject: cc: Own CCTimer by scoped_ptr instead of using OwnPtr.

BUG=154451
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org

Review URL: https://codereview.chromium.org/11118002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161766 0039d316-1c4b-4281-b951-d872f2087c98
---
 cc/texture_update_controller.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cc/texture_update_controller.h')

diff --git a/cc/texture_update_controller.h b/cc/texture_update_controller.h
index 74bb8ca..3eb629f 100644
--- a/cc/texture_update_controller.h
+++ b/cc/texture_update_controller.h
@@ -59,7 +59,7 @@ protected:
     void updateMoreTexturesNow();
 
     CCTextureUpdateControllerClient* m_client;
-    OwnPtr<CCTimer> m_timer;
+    scoped_ptr<CCTimer> m_timer;
     OwnPtr<CCTextureUpdateQueue> m_queue;
     bool m_contentsTexturesPurged;
     CCResourceProvider* m_resourceProvider;
@@ -72,6 +72,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN(CCTextureUpdateController);
 };
 
-}
+}  // namespace cc
 
 #endif // CCTextureUpdateController_h
-- 
cgit v1.1