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

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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/layer_tree_pixel_test.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "cc/base/switches.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 29 matching lines @@
   scoped_ptr<PixelTestOutputSurface> output_surface;
 
   switch (test_type_) {
     case SOFTWARE_WITH_DEFAULT:
     case SOFTWARE_WITH_BITMAP: {
       scoped_ptr<PixelTestSoftwareOutputDevice> software_output_device(
           new PixelTestSoftwareOutputDevice);
       software_output_device->set_surface_expansion_size(
           surface_expansion_size);
       output_surface = make_scoped_ptr(
-          new PixelTestOutputSurface(software_output_device.Pass()));
+          new PixelTestOutputSurface(
+              software_output_device.PassAs<SoftwareOutputDevice>()));
       break;
     }
 
     case GL_WITH_DEFAULT:
     case GL_WITH_BITMAP: {
       output_surface = make_scoped_ptr(
           new PixelTestOutputSurface(new TestInProcessContextProvider));
       break;
     }
   }
 
   output_surface->set_surface_expansion_size(surface_expansion_size);
-  return output_surface.Pass();
+  return output_surface.PassAs<OutputSurface>();
 }
 
 void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) {
   LayerTreeImpl* commit_tree =
       impl->pending_tree() ? impl->pending_tree() : impl->active_tree();
   if (commit_tree->source_frame_number() != 0)
     return;
 
   gfx::Rect viewport = impl->DeviceViewport();
   // The viewport has a 0,0 origin without external influence.
@@ skipping 147 matching lines @@
   root->AddChild(content_root_);
   layer_tree_host()->SetRootLayer(root);
   LayerTreeTest::SetupTree();
 }
 
 scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
     const gfx::Size& size,
     const TextureMailbox& texture_mailbox) {
   DCHECK(texture_mailbox.IsTexture());
   if (!texture_mailbox.IsTexture())
-    return nullptr;
+    return scoped_ptr<SkBitmap>();
 
   scoped_ptr<gpu::GLInProcessContext> context = CreateTestInProcessContext();
   GLES2Interface* gl = context->GetImplementation();
 
   if (texture_mailbox.sync_point())
     gl->WaitSyncPointCHROMIUM(texture_mailbox.sync_point());
 
   GLuint texture_id = 0;
   gl->GenTextures(1, &texture_id);
   gl->BindTexture(GL_TEXTURE_2D, texture_id);
@@ skipping 119 matching lines @@
 
   *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
   *release_callback = SingleReleaseCallback::Create(
       base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox,
                  base::Unretained(this),
                  base::Passed(&context),
                  texture_id));
 }
 
 }  // namespace cc