cc: Remove wtf usage from test code

This incidentally cleans up time source and layer sorter.

R=jamesr@chromium.org
BUG=154451

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162731 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 2f6660b..27ec709 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -73,11 +73,8 @@ public:
         : m_active(false)
         , m_client(0)
     {
-        turnOffVerifier();
     }
 
-    virtual ~FakeCCTimeSource() { }
-
     virtual void setClient(cc::CCTimeSourceClient* client) OVERRIDE;
     virtual void setActive(bool b) OVERRIDE;
     virtual bool active() const OVERRIDE;
@@ -95,6 +92,8 @@ public:
     void setNextTickTime(base::TimeTicks nextTickTime) { m_nextTickTime = nextTickTime; }
 
 protected:
+    virtual ~FakeCCTimeSource() { }
+
     bool m_active;
     base::TimeTicks m_nextTickTime;
     cc::CCTimeSourceClient* m_client;
@@ -102,9 +101,9 @@ protected:
 
 class FakeCCDelayBasedTimeSource : public cc::CCDelayBasedTimeSource {
 public:
-    static PassRefPtr<FakeCCDelayBasedTimeSource> create(base::TimeDelta interval, cc::CCThread* thread)
+    static scoped_refptr<FakeCCDelayBasedTimeSource> create(base::TimeDelta interval, cc::CCThread* thread)
     {
-        return adoptRef(new FakeCCDelayBasedTimeSource(interval, thread));
+        return make_scoped_refptr(new FakeCCDelayBasedTimeSource(interval, thread));
     }
 
     void setNow(base::TimeTicks time) { m_now = time; }
@@ -115,13 +114,14 @@ protected:
         : CCDelayBasedTimeSource(interval, thread)
     {
     }
+    virtual ~FakeCCDelayBasedTimeSource() { }
 
     base::TimeTicks m_now;
 };
 
 class FakeCCFrameRateController : public cc::CCFrameRateController {
 public:
-    FakeCCFrameRateController(PassRefPtr<cc::CCTimeSource> timer) : cc::CCFrameRateController(timer) { }
+    FakeCCFrameRateController(scoped_refptr<cc::CCTimeSource> timer) : cc::CCFrameRateController(timer) { }
 
     int numFramesPending() const { return m_numFramesPending; }
 };