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

cc/test/tiled_layer_test_common.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/test/tiled_layer_test_common.h"
 
 namespace cc {
 
 FakeLayerUpdater::Resource::Resource(FakeLayerUpdater* layer,
                                      scoped_ptr<PrioritizedResource> texture)
@@ skipping 40 matching lines @@
 }
 
 void FakeLayerUpdater::SetRectToInvalidate(const gfx::Rect& rect,
                                            FakeTiledLayer* layer) {
   rect_to_invalidate_ = rect;
   layer_ = layer;
 }
 
 scoped_ptr<LayerUpdater::Resource> FakeLayerUpdater::CreateResource(
     PrioritizedResourceManager* manager) {
-  return make_scoped_ptr(
+  return scoped_ptr<LayerUpdater::Resource>(
       new Resource(this, PrioritizedResource::Create(manager)));
 }
 
 FakeTiledLayerImpl::FakeTiledLayerImpl(LayerTreeImpl* tree_impl, int id)
     : TiledLayerImpl(tree_impl, id) {}
 
 FakeTiledLayerImpl::~FakeTiledLayerImpl() {}
 
 FakeTiledLayer::FakeTiledLayer(PrioritizedResourceManager* resource_manager)
     : TiledLayer(),
@@ skipping 85 matching lines @@
     float* contents_scale_y,
     gfx::Size* content_bounds) {
   *contents_scale_x =
       static_cast<float>(forced_content_bounds_.width()) / bounds().width();
   *contents_scale_y =
       static_cast<float>(forced_content_bounds_.height()) / bounds().height();
   *content_bounds = forced_content_bounds_;
 }
 
 }  // namespace cc