cc: Remove wtf includes for scrollbar layer classes

cc/scrollbar_geometry_fixed_thumb.cc

Index: cc/scrollbar_geometry_fixed_thumb.cc
diff --git a/cc/scrollbar_geometry_fixed_thumb.cc b/cc/scrollbar_geometry_fixed_thumb.cc
index dc55829fb8cb8282f6b94004d509500d19e6cd62..803aa1730a3de4a62605b13ba3812d443868244f 100644
--- a/cc/scrollbar_geometry_fixed_thumb.cc
+++ b/cc/scrollbar_geometry_fixed_thumb.cc
@@ -16,9 +16,9 @@ using WebKit::WebScrollbarThemeGeometry;
 
 namespace cc {
 
-PassOwnPtr<CCScrollbarGeometryFixedThumb> CCScrollbarGeometryFixedThumb::create(PassOwnPtr<WebScrollbarThemeGeometry> geometry)
+scoped_ptr<CCScrollbarGeometryFixedThumb> CCScrollbarGeometryFixedThumb::create(scoped_ptr<WebScrollbarThemeGeometry> geometry)
 {
-    return adoptPtr(new CCScrollbarGeometryFixedThumb(geometry));
+    return make_scoped_ptr(new CCScrollbarGeometryFixedThumb(geometry.Pass()));
 }
 
 CCScrollbarGeometryFixedThumb::~CCScrollbarGeometryFixedThumb()
@@ -37,7 +37,7 @@ void CCScrollbarGeometryFixedThumb::update(WebScrollbar* scrollbar)
 
 WebScrollbarThemeGeometry* CCScrollbarGeometryFixedThumb::clone() const
 {
-    CCScrollbarGeometryFixedThumb* geometry = new CCScrollbarGeometryFixedThumb(adoptPtr(CCScrollbarGeometryStub::clone()));
+    CCScrollbarGeometryFixedThumb* geometry = new CCScrollbarGeometryFixedThumb(make_scoped_ptr(CCScrollbarGeometryStub::clone()));
     geometry->m_thumbSize = m_thumbSize;
     return geometry;
 }
@@ -86,8 +86,8 @@ void CCScrollbarGeometryFixedThumb::splitTrack(WebScrollbar* scrollbar, const We
     }
 }
 
-CCScrollbarGeometryFixedThumb::CCScrollbarGeometryFixedThumb(PassOwnPtr<WebScrollbarThemeGeometry> geometry)
-    : CCScrollbarGeometryStub(geometry)
+CCScrollbarGeometryFixedThumb::CCScrollbarGeometryFixedThumb(scoped_ptr<WebScrollbarThemeGeometry> geometry)
+    : CCScrollbarGeometryStub(geometry.Pass())
 {
 }