Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

ui/compositor/transform_animation_curve_adapter.cc

 // Copyright (c) 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 "ui/compositor/transform_animation_curve_adapter.h"
 
 namespace ui {
 
 TransformAnimationCurveAdapter::TransformAnimationCurveAdapter(
     gfx::Tween::Type tween_type,
     gfx::Transform initial_value,
     gfx::Transform target_value,
     base::TimeDelta duration)
     : tween_type_(tween_type),
       initial_value_(initial_value),
       target_value_(target_value),
       duration_(duration) {
   gfx::DecomposeTransform(&decomposed_initial_value_, initial_value_);
   gfx::DecomposeTransform(&decomposed_target_value_, target_value_);
 }
 
 TransformAnimationCurveAdapter::~TransformAnimationCurveAdapter() {
 }
 
 double TransformAnimationCurveAdapter::Duration() const {
   return duration_.InSecondsF();
 }
 
 scoped_ptr<cc::AnimationCurve> TransformAnimationCurveAdapter::Clone() const {
-  scoped_ptr<TransformAnimationCurveAdapter> to_return(
-      new TransformAnimationCurveAdapter(tween_type_,
-                                         initial_value_,
-                                         target_value_,
-                                         duration_));
-  return to_return.PassAs<cc::AnimationCurve>();
+  return make_scoped_ptr(new TransformAnimationCurveAdapter(
+      tween_type_, initial_value_, target_value_, duration_));
 }
 
 gfx::Transform TransformAnimationCurveAdapter::GetValue(
     double t) const {
   if (t >= duration_.InSecondsF())
     return target_value_;
   if (t <= 0.0)
     return initial_value_;
   double progress = t / duration_.InSecondsF();
 
@@ skipping 42 matching lines @@
 }
 
 InverseTransformCurveAdapter::~InverseTransformCurveAdapter() {
 }
 
 double InverseTransformCurveAdapter::Duration() const {
   return duration_.InSeconds();
 }
 
 scoped_ptr<cc::AnimationCurve> InverseTransformCurveAdapter::Clone() const {
-  scoped_ptr<InverseTransformCurveAdapter> to_return(
-      new InverseTransformCurveAdapter(base_curve_,
-                                       initial_value_,
-                                       duration_));
-  return to_return.PassAs<cc::AnimationCurve>();
+  return make_scoped_ptr(
+      new InverseTransformCurveAdapter(base_curve_, initial_value_, duration_));
 }
 
 gfx::Transform InverseTransformCurveAdapter::GetValue(
     double t) const {
   if (t <= 0.0)
     return initial_value_;
 
   gfx::Transform base_transform = base_curve_.GetValue(t);
   // Invert base
   gfx::Transform to_return(gfx::Transform::kSkipInitialization);
@@ skipping 22 matching lines @@
   return initial_value_.IsIdentityOrTranslation() &&
          base_curve_.IsTranslation();
 }
 
 bool InverseTransformCurveAdapter::MaximumTargetScale(bool forward_direction,
                                                       float* max_scale) const {
   return false;
 }
 
 }  // namespace ui