Index: content/renderer/mus/render_widget_mus_connection.cc |
diff --git a/content/renderer/mus/render_widget_mus_connection.cc b/content/renderer/mus/render_widget_mus_connection.cc |
index e0f1c74989cd8ef48a46c6bd67ea53452acdcefc..0663cd7a11db6e62ea804748101eebcc1106a59a 100644 |
--- a/content/renderer/mus/render_widget_mus_connection.cc |
+++ b/content/renderer/mus/render_widget_mus_connection.cc |
@@ -45,7 +45,8 @@ void RenderWidgetMusConnection::Bind( |
} |
} |
-scoped_ptr<cc::OutputSurface> RenderWidgetMusConnection::CreateOutputSurface() { |
+std::unique_ptr<cc::OutputSurface> |
+RenderWidgetMusConnection::CreateOutputSurface() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
DCHECK(!window_surface_binding_); |
mus::mojom::GpuPtr gpu_service; |
@@ -55,7 +56,7 @@ scoped_ptr<cc::OutputSurface> RenderWidgetMusConnection::CreateOutputSurface() { |
gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb)); |
scoped_refptr<cc::ContextProvider> context_provider( |
new mus::ContextProvider(cb.PassInterface().PassHandle())); |
- scoped_ptr<cc::OutputSurface> surface(new mus::OutputSurface( |
+ std::unique_ptr<cc::OutputSurface> surface(new mus::OutputSurface( |
context_provider, mus::WindowSurface::Create(&window_surface_binding_))); |
if (compositor_mus_connection_) { |
compositor_mus_connection_->AttachSurfaceOnMainThread( |
@@ -123,7 +124,7 @@ void RenderWidgetMusConnection::OnDidOverscroll( |
} |
void RenderWidgetMusConnection::OnInputEventAck( |
- scoped_ptr<InputEventAck> input_event_ack) { |
+ std::unique_ptr<InputEventAck> input_event_ack) { |
DCHECK(!pending_ack_.is_null()); |
pending_ack_.Run(input_event_ack->state == |
InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED); |
@@ -167,7 +168,7 @@ void RenderWidgetMusConnection::OnConnectionLost() { |
} |
void RenderWidgetMusConnection::OnWindowInputEvent( |
- scoped_ptr<blink::WebInputEvent> input_event, |
+ std::unique_ptr<blink::WebInputEvent> input_event, |
const base::Callback<void(bool)>& ack) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
// If we don't yet have a RenderWidgetInputHandler then we don't yet have |