| Index: cc/test/layer_tree_pixel_test.cc
|
| diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
|
| index 4e4e0394021a6c7b74927d72feb73afe32e50879..ed14e33f0e031fe3649f8176083503a1ff46907f 100644
|
| --- a/cc/test/layer_tree_pixel_test.cc
|
| +++ b/cc/test/layer_tree_pixel_test.cc
|
| @@ -47,8 +47,7 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface(
|
| software_output_device->set_surface_expansion_size(
|
| surface_expansion_size);
|
| output_surface = make_scoped_ptr(
|
| - new PixelTestOutputSurface(
|
| - software_output_device.PassAs<SoftwareOutputDevice>()));
|
| + new PixelTestOutputSurface(software_output_device.Pass()));
|
| break;
|
| }
|
|
|
| @@ -61,7 +60,7 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface(
|
| }
|
|
|
| output_surface->set_surface_expansion_size(surface_expansion_size);
|
| - return output_surface.PassAs<OutputSurface>();
|
| + return output_surface.Pass();
|
| }
|
|
|
| void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) {
|
| @@ -229,7 +228,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
|
| const TextureMailbox& texture_mailbox) {
|
| DCHECK(texture_mailbox.IsTexture());
|
| if (!texture_mailbox.IsTexture())
|
| - return scoped_ptr<SkBitmap>();
|
| + return nullptr;
|
|
|
| scoped_ptr<gpu::GLInProcessContext> context = CreateTestInProcessContext();
|
| GLES2Interface* gl = context->GetImplementation();
|
|
|