| Index: remoting/client/jni/jni_gl_display_handler.cc
|
| diff --git a/remoting/client/jni/jni_gl_display_handler.cc b/remoting/client/jni/jni_gl_display_handler.cc
|
| index 4b6d23084551fb1b0170697deb9e7a9244131648..7ab77ebcbd9db5cec9501431e831bc6536991461 100644
|
| --- a/remoting/client/jni/jni_gl_display_handler.cc
|
| +++ b/remoting/client/jni/jni_gl_display_handler.cc
|
| @@ -46,8 +46,8 @@ void JniGlDisplayHandler::InitializeClient(
|
|
|
| std::unique_ptr<protocol::CursorShapeStub>
|
| JniGlDisplayHandler::CreateCursorShapeStub() {
|
| - return base::WrapUnique(
|
| - new CursorShapeStubProxy(weak_ptr_, runtime_->display_task_runner()));
|
| + return base::MakeUnique<CursorShapeStubProxy>(
|
| + weak_ptr_, runtime_->display_task_runner());
|
| }
|
|
|
| std::unique_ptr<protocol::VideoRenderer>
|
| @@ -55,12 +55,12 @@ JniGlDisplayHandler::CreateVideoRenderer() {
|
| DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread());
|
| DCHECK(!frame_consumer_);
|
| std::unique_ptr<DualBufferFrameConsumer> consumer =
|
| - base::WrapUnique(new DualBufferFrameConsumer(
|
| + base::MakeUnique<DualBufferFrameConsumer>(
|
| base::Bind(&GlRenderer::OnFrameReceived, renderer_.GetWeakPtr()),
|
| runtime_->display_task_runner(),
|
| - protocol::FrameConsumer::PixelFormat::FORMAT_RGBA));
|
| + protocol::FrameConsumer::PixelFormat::FORMAT_RGBA);
|
| frame_consumer_ = consumer->GetWeakPtr();
|
| - return base::WrapUnique(new SoftwareVideoRenderer(std::move(consumer)));
|
| + return base::MakeUnique<SoftwareVideoRenderer>(std::move(consumer));
|
| }
|
|
|
| // static
|
|
|