cc: Remove wtf includes from layer_impl.h

cc/scrollbar_animation_controller.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCScrollbarAnimationController.h"
 
 #include "CCScrollbarLayerImpl.h"
 #include <wtf/CurrentTime.h>
 
 #if OS(ANDROID)
 #include "CCScrollbarAnimationControllerLinearFade.h"
 #endif
 
 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
 
 CCScrollbarAnimationController::CCScrollbarAnimationController(CCLayerImpl* scrollLayer)
     : m_horizontalScrollbarLayer(0)
     , m_verticalScrollbarLayer(0)
 {
     CCScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, 0);
 }
 
@@ skipping 49 matching lines @@
     }
 
     if (m_verticalScrollbarLayer) {
         m_verticalScrollbarLayer->setCurrentPos(m_currentPos.y());
         m_verticalScrollbarLayer->setTotalSize(m_totalSize.height());
         m_verticalScrollbarLayer->setMaximum(m_maximum.height());
     }
 }
 
 } // namespace cc