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

cc/layers/tiled_layer_unittest.cc

 // Copyright 2011 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/tiled_layer.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/run_loop.h"
@@ skipping 122 matching lines @@
     host_impl_ = make_scoped_ptr(
         new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get()));
   }
 
   virtual ~TiledLayerTest() {
     ResourceManagerClearAllMemory(resource_manager_.get(),
                                   resource_provider_.get());
 
     DebugScopedSetImplThreadAndMainThreadBlocked
     impl_thread_and_main_thread_blocked(proxy_);
-    resource_provider_ = nullptr;
-    host_impl_ = nullptr;
+    resource_provider_.reset();
+    host_impl_.reset();
   }
 
   void ResourceManagerClearAllMemory(
       PrioritizedResourceManager* resource_manager,
       ResourceProvider* resource_provider) {
     {
       DebugScopedSetImplThreadAndMainThreadBlocked
       impl_thread_and_main_thread_blocked(proxy_);
       resource_manager->ClearAllMemory(resource_provider);
       resource_manager->ReduceMemory(resource_provider);
@@ skipping 1503 matching lines @@
  private:
   gfx::Rect painted_rect_;
 };
 
 class UpdateTrackingTiledLayer : public FakeTiledLayer {
  public:
   explicit UpdateTrackingTiledLayer(PrioritizedResourceManager* manager)
       : FakeTiledLayer(manager) {
     scoped_ptr<TrackingLayerPainter> painter(TrackingLayerPainter::Create());
     tracking_layer_painter_ = painter.get();
-    layer_updater_ = BitmapContentLayerUpdater::Create(
-        painter.Pass(), &stats_instrumentation_, 0);
+    layer_updater_ =
+        BitmapContentLayerUpdater::Create(painter.PassAs<LayerPainter>(),
+                                          &stats_instrumentation_,
+                                          0);
   }
 
   TrackingLayerPainter* tracking_layer_painter() const {
     return tracking_layer_painter_;
   }
 
  private:
   virtual LayerUpdater* Updater() const OVERRIDE {
     return layer_updater_.get();
   }
@@ skipping 77 matching lines @@
 
   // Rounding leads to an extra pixel.
   gfx::Rect expanded_layer_rect(layer_rect);
   expanded_layer_rect.set_height(32);
   EXPECT_RECT_EQ(expanded_layer_rect,
                  layer->tracking_layer_painter()->PaintedRect());
 }
 
 }  // namespace
 }  // namespace cc