Index: ui/compositor/test/in_process_context_factory.cc |
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc |
index a1165b20f90166eb2ba6ddd8e0b61ecf531349c0..d9422dd64789876e9d3eb999f0f001ff868a763a 100644 |
--- a/ui/compositor/test/in_process_context_factory.cc |
+++ b/ui/compositor/test/in_process_context_factory.cc |
@@ -4,6 +4,8 @@ |
#include "ui/compositor/test/in_process_context_factory.h" |
+#include <utility> |
+ |
#include "base/bind.h" |
#include "base/command_line.h" |
#include "base/threading/thread.h" |
@@ -153,7 +155,7 @@ void InProcessContextFactory::CreateOutputSurface( |
if (surface_manager_) { |
scoped_ptr<cc::OnscreenDisplayClient> display_client( |
new cc::OnscreenDisplayClient( |
- real_output_surface.Pass(), surface_manager_, |
+ std::move(real_output_surface), surface_manager_, |
GetSharedBitmapManager(), GetGpuMemoryBufferManager(), |
compositor->GetRendererSettings(), compositor->task_runner())); |
scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( |
@@ -163,12 +165,12 @@ void InProcessContextFactory::CreateOutputSurface( |
display_client->set_surface_output_surface(surface_output_surface.get()); |
surface_output_surface->set_display_client(display_client.get()); |
- compositor->SetOutputSurface(surface_output_surface.Pass()); |
+ compositor->SetOutputSurface(std::move(surface_output_surface)); |
delete per_compositor_data_[compositor.get()]; |
per_compositor_data_[compositor.get()] = display_client.release(); |
} else { |
- compositor->SetOutputSurface(real_output_surface.Pass()); |
+ compositor->SetOutputSurface(std::move(real_output_surface)); |
} |
} |