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

cc/layers/video_layer_impl.cc

Index: cc/layers/video_layer_impl.cc
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index 2edea947da42c07b0b00bb3db1ae402f44ab918e..4bfd1cd58030af5e1f72715966d31b7aa0ee097b 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -59,7 +59,8 @@
 
 scoped_ptr<LayerImpl> VideoLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
-  return make_scoped_ptr(new VideoLayerImpl(tree_impl, id(), video_rotation_));
+  VideoLayerImpl* impl = new VideoLayerImpl(tree_impl, id(), video_rotation_);
+  return scoped_ptr<LayerImpl>(impl);
 }
 
 void VideoLayerImpl::PushPropertiesTo(LayerImpl* layer) {
@@ -89,7 +90,7 @@
 
   if (!frame_.get()) {
     // Drop any resources used by the updater if there is no frame to display.
-    updater_ = nullptr;
+    updater_.reset();
 
     provider_client_impl_->ReleaseLock();
     return false;
@@ -357,7 +358,7 @@
 }
 
 void VideoLayerImpl::ReleaseResources() {
-  updater_ = nullptr;
+  updater_.reset();
 }
 
 void VideoLayerImpl::SetNeedsRedraw() {