Convert //remoting to use std::unique_ptr

remoting/protocol/ice_connection_to_client.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/ice_connection_to_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "net/base/io_buffer.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vpx.h"
 #include "remoting/protocol/audio_writer.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/host_control_dispatcher.h"
 #include "remoting/protocol/host_event_dispatcher.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/host_video_dispatcher.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/video_frame_pump.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 
-scoped_ptr<VideoEncoder> CreateVideoEncoder(
+std::unique_ptr<VideoEncoder> CreateVideoEncoder(
     const protocol::SessionConfig& config) {
   const protocol::ChannelConfig& video_config = config.video_config();
 
   if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
     return VideoEncoderVpx::CreateForVP8();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP9) {
     return VideoEncoderVpx::CreateForVP9();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
-    return make_scoped_ptr(new VideoEncoderVerbatim());
+    return base::WrapUnique(new VideoEncoderVerbatim());
   }
 
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace
 
 IceConnectionToClient::IceConnectionToClient(
-    scoped_ptr<protocol::Session> session,
+    std::unique_ptr<protocol::Session> session,
     scoped_refptr<TransportContext> transport_context,
     scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner)
     : event_handler_(nullptr),
       session_(std::move(session)),
       video_encode_task_runner_(video_encode_task_runner),
       transport_(transport_context, this),
       control_dispatcher_(new HostControlDispatcher()),
       event_dispatcher_(new HostEventDispatcher()),
       video_dispatcher_(new HostVideoDispatcher()) {
   session_->SetEventHandler(this);
@@ skipping 19 matching lines @@
   // This should trigger OnConnectionClosed() event and this object
   // may be destroyed as the result.
   session_->Close(error);
 }
 
 void IceConnectionToClient::OnInputEventReceived(int64_t timestamp) {
   DCHECK(thread_checker_.CalledOnValidThread());
   event_handler_->OnInputEventReceived(this, timestamp);
 }
 
-scoped_ptr<VideoStream> IceConnectionToClient::StartVideoStream(
-    scoped_ptr<webrtc::DesktopCapturer> desktop_capturer) {
+std::unique_ptr<VideoStream> IceConnectionToClient::StartVideoStream(
+    std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  scoped_ptr<VideoEncoder> video_encoder =
+  std::unique_ptr<VideoEncoder> video_encoder =
       CreateVideoEncoder(session_->config());
 
-  scoped_ptr<VideoFramePump> pump(
+  std::unique_ptr<VideoFramePump> pump(
       new VideoFramePump(video_encode_task_runner_, std::move(desktop_capturer),
                          std::move(video_encoder), video_dispatcher_.get()));
   video_dispatcher_->set_video_feedback_stub(pump->video_feedback_stub());
   return std::move(pump);
 }
 
 AudioStub* IceConnectionToClient::audio_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return audio_writer_.get();
 }
@@ skipping 102 matching lines @@
 
 void IceConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_dispatcher_.reset();
   audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting