cc: Remove wtf includes for scrollbar layer classes

cc/scrollbar_geometry_fixed_thumb.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 "CCScrollbarGeometryFixedThumb.h"
 
 #include <cmath>
 #include <public/WebRect.h>
 #include <public/WebScrollbar.h>
 
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
 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()
 {
 }
 
 void CCScrollbarGeometryFixedThumb::update(WebScrollbar* scrollbar)
 {
     int length = CCScrollbarGeometryStub::thumbLength(scrollbar);
 
     if (scrollbar->orientation() == WebScrollbar::Horizontal)
         m_thumbSize = IntSize(length, scrollbar->size().height);
     else
         m_thumbSize = IntSize(scrollbar->size().width, length);
 }
 
 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;
 }
 
 int CCScrollbarGeometryFixedThumb::thumbLength(WebScrollbar* scrollbar)
 {
     if (scrollbar->orientation() == WebScrollbar::Horizontal)
         return m_thumbSize.width();
     return m_thumbSize.height();
 }
@@ skipping 28 matching lines @@
         thumbRect = WebRect(trackRect.x + thumbPos, trackRect.y + (trackRect.height - thickness) / 2, thumbLength(scrollbar), thickness);
         beforeThumbRect = WebRect(trackRect.x, trackRect.y, thumbPos + thumbRect.width / 2, trackRect.height);
         afterThumbRect = WebRect(trackRect.x + beforeThumbRect.width, trackRect.y, trackRect.x + trackRect.width - beforeThumbRect.x - beforeThumbRect.width, trackRect.height);
     } else {
         thumbRect = WebRect(trackRect.x + (trackRect.width - thickness) / 2, trackRect.y + thumbPos, thickness, thumbLength(scrollbar));
         beforeThumbRect = WebRect(trackRect.x, trackRect.y, trackRect.width, thumbPos + thumbRect.height / 2);
         afterThumbRect = WebRect(trackRect.x, trackRect.y + beforeThumbRect.height, trackRect.width, trackRect.y + trackRect.height - beforeThumbRect.y - beforeThumbRect.height);
     }
 }
 
-CCScrollbarGeometryFixedThumb::CCScrollbarGeometryFixedThumb(PassOwnPtr<WebScrollbarThemeGeometry> geometry)
-    : CCScrollbarGeometryStub(geometry)
+CCScrollbarGeometryFixedThumb::CCScrollbarGeometryFixedThumb(scoped_ptr<WebScrollbarThemeGeometry> geometry)
+    : CCScrollbarGeometryStub(geometry.Pass())
 {
 }
 
 }