Index: cc/output/software_renderer_unittest.cc |
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc |
index 4658b512a0fa73cf09cce8ecc9819dc596480d7c..12976623da7243f2fa5a89e4e0d1dbac29c71be2 100644 |
--- a/cc/output/software_renderer_unittest.cc |
+++ b/cc/output/software_renderer_unittest.cc |
@@ -31,8 +31,8 @@ class SoftwareRendererTest : public testing::Test, public RendererClient { |
public: |
void InitializeRenderer( |
scoped_ptr<SoftwareOutputDevice> software_output_device) { |
- output_surface_ = FakeOutputSurface::CreateSoftware( |
- software_output_device.Pass()); |
+ output_surface_ = |
+ FakeOutputSurface::CreateSoftware(std::move(software_output_device)); |
CHECK(output_surface_->BindToClient(&output_surface_client_)); |
shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
@@ -69,7 +69,7 @@ class SoftwareRendererTest : public testing::Test, public RendererClient { |
device_viewport_rect, |
false); |
loop.Run(); |
- return bitmap_result.Pass(); |
+ return bitmap_result; |
} |
static void SaveBitmapResult(scoped_ptr<SkBitmap>* bitmap_result, |
@@ -123,7 +123,7 @@ TEST_F(SoftwareRendererTest, SolidColorQuad) { |
shared_quad_state, outer_rect, outer_rect, SK_ColorYELLOW, false); |
RenderPassList list; |
- list.push_back(root_render_pass.Pass()); |
+ list.push_back(std::move(root_render_pass)); |
float device_scale_factor = 1.f; |
gfx::Rect device_viewport_rect(outer_size); |
@@ -195,7 +195,7 @@ TEST_F(SoftwareRendererTest, TileQuad) { |
outer_size, false, false); |
RenderPassList list; |
- list.push_back(root_render_pass.Pass()); |
+ list.push_back(std::move(root_render_pass)); |
float device_scale_factor = 1.f; |
gfx::Rect device_viewport_rect(outer_size); |
@@ -257,7 +257,7 @@ TEST_F(SoftwareRendererTest, TileQuadVisibleRect) { |
quad->visible_rect = visible_rect; |
RenderPassList list; |
- list.push_back(root_render_pass.Pass()); |
+ list.push_back(std::move(root_render_pass)); |
float device_scale_factor = 1.f; |
gfx::Rect device_viewport_rect(tile_size); |