[cc] Use base ptr types for cc's CSS animation classes

webkit/compositor_bindings/WebAnimationCurveCommon.cpp

Index: webkit/compositor_bindings/WebAnimationCurveCommon.cpp
diff --git a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
index d13750e440a727bd8b2e52f9663e671d9f095f53..2cd5ac20c6e6865b8efb67fb64cd8c91b66e0b8b 100644
--- a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
@@ -8,12 +8,9 @@
 
 #include "CCTimingFunction.h"
 
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-
 namespace WebKit {
 
-PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
+scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
 {
     switch (type) {
     case WebAnimationCurve::TimingFunctionTypeEase:
@@ -25,9 +22,9 @@ PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingF
     case WebAnimationCurve::TimingFunctionTypeEaseInOut:
         return cc::CCEaseInOutTimingFunction::create();
     case WebAnimationCurve::TimingFunctionTypeLinear:
-        return nullptr;
+        return scoped_ptr<cc::CCTimingFunction>();
     }
-    return nullptr;
+    return scoped_ptr<cc::CCTimingFunction>();
 }
 
 } // namespace WebKit