cc: Remove use of PassAs() and constructor-casting with scoped_ptr.

cc/layers/layer_impl.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 "cc/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
@@ skipping 101 matching lines @@
   for (OwnedLayerImplList::iterator it = children_.begin();
        it != children_.end();
        ++it) {
     if (*it == child) {
       scoped_ptr<LayerImpl> ret = children_.take(it);
       children_.erase(it);
       layer_tree_impl()->set_needs_update_draw_properties();
       return ret.Pass();
     }
   }
-  return scoped_ptr<LayerImpl>();
+  return nullptr;
 }
 
 void LayerImpl::SetParent(LayerImpl* parent) {
   if (parent_should_know_need_push_properties()) {
     if (parent_)
       parent_->RemoveDependentNeedsPushProperties();
     if (parent)
       parent->AddDependentNeedsPushProperties();
   }
   parent_ = parent;
@@ skipping 106 matching lines @@
 }
 
 void LayerImpl::CreateRenderSurface() {
   DCHECK(!draw_properties_.render_surface);
   draw_properties_.render_surface =
       make_scoped_ptr(new RenderSurfaceImpl(this));
   draw_properties_.render_target = this;
 }
 
 void LayerImpl::ClearRenderSurface() {
-  draw_properties_.render_surface.reset();
+  draw_properties_.render_surface = nullptr;
 }
 
 void LayerImpl::ClearRenderSurfaceLayerList() {
   if (draw_properties_.render_surface)
     draw_properties_.render_surface->layer_list().clear();
 }
 
 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const {
   state->SetAll(draw_properties_.target_space_transform,
                 draw_properties_.content_bounds,
@@ skipping 1057 matching lines @@
 }
 
 void LayerImpl::DidBecomeActive() {
   if (layer_tree_impl_->settings().scrollbar_animator ==
       LayerTreeSettings::NoAnimator) {
     return;
   }
 
   bool need_scrollbar_animation_controller = scrollable() && scrollbars_;
   if (!need_scrollbar_animation_controller) {
-    scrollbar_animation_controller_.reset();
+    scrollbar_animation_controller_ = nullptr;
     return;
   }
 
   if (scrollbar_animation_controller_)
     return;
 
   scrollbar_animation_controller_ =
       layer_tree_impl_->CreateScrollbarAnimationController(this);
 }
 
@@ skipping 13 matching lines @@
   scrollbars_->insert(layer);
 }
 
 void LayerImpl::RemoveScrollbar(ScrollbarLayerImplBase* layer) {
   DCHECK(scrollbars_);
   DCHECK(layer);
   DCHECK(scrollbars_->find(layer) != scrollbars_->end());
 
   scrollbars_->erase(layer);
   if (scrollbars_->empty())
-    scrollbars_.reset();
+    scrollbars_ = nullptr;
 }
 
 bool LayerImpl::HasScrollbar(ScrollbarOrientation orientation) const {
   if (!scrollbars_)
     return false;
 
   for (ScrollbarSet::iterator it = scrollbars_->begin();
        it != scrollbars_->end();
        ++it)
     if ((*it)->orientation() == orientation)
@@ skipping 177 matching lines @@
 }
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
     Animation::TargetProperty target_property) {
   if (target_property == Animation::ScrollOffset)
     layer_tree_impl_->InputScrollAnimationFinished();
 }
 
 }  // namespace cc