cc: Remove wtf includes from layer_impl.h

cc/scrollbar_animation_controller.cc

Index: cc/scrollbar_animation_controller.cc
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 89f74cb55ead58446537318609e8c7a7b732d0df..534ec3c836f1b383ba2e035decd9901ca8b961e8 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -16,16 +16,16 @@
 namespace cc {
 
 #if OS(ANDROID)
-PassOwnPtr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
+scoped_ptr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
 {
     static const double fadeoutDelay = 0.3;
     static const double fadeoutLength = 0.3;
-    return CCScrollbarAnimationControllerLinearFade::create(scrollLayer, fadeoutDelay, fadeoutLength);
+    return CCScrollbarAnimationControllerLinearFade::create(scrollLayer, fadeoutDelay, fadeoutLength).PassAs<CCScrollbarAnimationController>();
 }
 #else
-PassOwnPtr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
+scoped_ptr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
 {
-    return adoptPtr(new CCScrollbarAnimationController(scrollLayer));
+    return make_scoped_ptr(new CCScrollbarAnimationController(scrollLayer));
 }
 #endif