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

3 files changed, 19 insertions, 18 deletions

diff --git a/webkit/compositor_bindings/WebLayerTest.cpp b/webkit/compositor_bindings/WebLayerTest.cpp
index 36571d3..df3de4c 100644
--- a/webkit/compositor_bindings/WebLayerTest.cpp
+++ b/webkit/compositor_bindings/WebLayerTest.cpp
@@ -46,9 +46,10 @@ public:
 
     virtual void SetUp()
     {
-        m_rootLayer = adoptPtr(WebLayer::create());
+        m_rootLayer.reset(WebLayer::create());
         EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
-        EXPECT_TRUE(m_view = adoptPtr(WebLayerTreeView::create(&m_client, *m_rootLayer, WebLayerTreeView::Settings())));
+        m_view.reset(WebLayerTreeView::create(&m_client, *m_rootLayer, WebLayerTreeView::Settings()));
+        EXPECT_TRUE(m_view);
         Mock::VerifyAndClearExpectations(&m_client);
     }
 
@@ -56,15 +57,15 @@ public:
     {
         // We may get any number of scheduleComposite calls during shutdown.
         EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
-        m_rootLayer.clear();
-        m_view.clear();
+        m_rootLayer.reset();
+        m_view.reset();
     }
 
 protected:
     WebKitTests::WebCompositorInitializer m_compositorInitializer;
     MockWebLayerTreeViewClient m_client;
-    OwnPtr<WebLayer> m_rootLayer;
-    OwnPtr<WebLayerTreeView> m_view;
+    scoped_ptr<WebLayer> m_rootLayer;
+    scoped_ptr<WebLayerTreeView> m_view;
 };
 
 // Tests that the client gets called to ask for a composite if we change the
@@ -73,7 +74,7 @@ TEST_F(WebLayerTest, Client)
 {
     // Base layer.
     EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
-    OwnPtr<WebLayer> layer = adoptPtr(WebLayer::create());
+    scoped_ptr<WebLayer> layer(WebLayer::create());
     m_rootLayer->addChild(layer.get());
     Mock::VerifyAndClearExpectations(&m_client);
 
@@ -101,7 +102,7 @@ TEST_F(WebLayerTest, Client)
     EXPECT_TRUE(layer->masksToBounds());
 
     EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
-    OwnPtr<WebLayer> otherLayer = adoptPtr(WebLayer::create());
+    scoped_ptr<WebLayer> otherLayer(WebLayer::create());
     m_rootLayer->addChild(otherLayer.get());
     EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1));
     layer->setMaskLayer(otherLayer.get());
@@ -125,7 +126,7 @@ TEST_F(WebLayerTest, Client)
 
     // Texture layer.
     EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1));
-    OwnPtr<WebExternalTextureLayer> textureLayer = adoptPtr(WebExternalTextureLayer::create());
+    scoped_ptr<WebExternalTextureLayer> textureLayer(WebExternalTextureLayer::create());
     m_rootLayer->addChild(textureLayer->layer());
     Mock::VerifyAndClearExpectations(&m_client);
 
@@ -147,7 +148,7 @@ TEST_F(WebLayerTest, Client)
     MockWebContentLayerClient contentClient;
     EXPECT_CALL(contentClient, paintContents(_, _, _)).Times(AnyNumber());
     EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
-    OwnPtr<WebContentLayer> contentLayer = adoptPtr(WebContentLayer::create(&contentClient));
+    scoped_ptr<WebContentLayer> contentLayer(WebContentLayer::create(&contentClient));
     m_rootLayer->addChild(contentLayer->layer());
     Mock::VerifyAndClearExpectations(&m_client);
 
@@ -158,7 +159,7 @@ TEST_F(WebLayerTest, Client)
 
     // Solid color layer.
     EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1));
-    OwnPtr<WebSolidColorLayer> solidColorLayer = adoptPtr(WebSolidColorLayer::create());
+    scoped_ptr<WebSolidColorLayer> solidColorLayer(WebSolidColorLayer::create());
     m_rootLayer->addChild(solidColorLayer->layer());
     Mock::VerifyAndClearExpectations(&m_client);
 
diff --git a/webkit/compositor_bindings/WebLayerTreeViewTest.cpp b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
index 3fd0915..ab2ea3e 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
@@ -101,14 +101,14 @@ class CancelableTaskWrapper : public base::RefCounted<CancelableTaskWrapper> {
     };
 
 public:
-    CancelableTaskWrapper(PassOwnPtr<WebThread::Task> task)
-        : m_task(task)
+    CancelableTaskWrapper(scoped_ptr<WebThread::Task> task)
+        : m_task(task.Pass())
     {
     }
 
     void cancel()
     {
-        m_task.clear();
+        m_task.reset();
     }
 
     WebThread::Task* createTask()
@@ -122,14 +122,14 @@ public:
         if (!m_task)
             return;
         m_task->run();
-        m_task.clear();
+        m_task.reset();
     }
 
 private:
     friend class base::RefCounted<CancelableTaskWrapper>;
     ~CancelableTaskWrapper() { }
 
-    OwnPtr<WebThread::Task> m_task;
+    scoped_ptr<WebThread::Task> m_task;
 };
 
 class WebLayerTreeViewThreadedTest : public WebLayerTreeViewTestBase {
@@ -144,7 +144,7 @@ protected:
     void composite()
     {
         m_view->setNeedsRedraw();
-        scoped_refptr<CancelableTaskWrapper> timeoutTask(new CancelableTaskWrapper(adoptPtr(new TimeoutTask())));
+        scoped_refptr<CancelableTaskWrapper> timeoutTask(new CancelableTaskWrapper(scoped_ptr<WebThread::Task>(new TimeoutTask())));
         WebKit::Platform::current()->currentThread()->postDelayedTask(timeoutTask->createTask(), 5000);
         WebKit::Platform::current()->currentThread()->enterRunLoop();
         timeoutTask->cancel();
diff --git a/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h b/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
index 305febf..a2e9222 100644
--- a/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
+++ b/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
@@ -23,7 +23,7 @@ public:
 
     virtual WebCompositorOutputSurface* createOutputSurface() OVERRIDE
     {
-        return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes())).release();
+        return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).release();
     }
     virtual void didRecreateOutputSurface(bool) OVERRIDE { }