Index: remoting/protocol/ice_connection_to_client.h |
diff --git a/remoting/protocol/ice_connection_to_client.h b/remoting/protocol/ice_connection_to_client.h |
index a543ead32f58975f7a1beea64f34e44e7c4a7327..e0d034b86ef4edf6dc5842e5ec3e078446fa9e9c 100644 |
--- a/remoting/protocol/ice_connection_to_client.h |
+++ b/remoting/protocol/ice_connection_to_client.h |
@@ -7,10 +7,10 @@ |
#include <stdint.h> |
+#include <memory> |
#include <string> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/threading/thread_checker.h" |
#include "remoting/protocol/channel_dispatcher_base.h" |
#include "remoting/protocol/connection_to_client.h" |
@@ -36,7 +36,7 @@ class IceConnectionToClient : public ConnectionToClient, |
public ChannelDispatcherBase::EventHandler { |
public: |
IceConnectionToClient( |
- scoped_ptr<Session> session, |
+ std::unique_ptr<Session> session, |
scoped_refptr<TransportContext> transport_context, |
scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner); |
~IceConnectionToClient() override; |
@@ -47,8 +47,8 @@ class IceConnectionToClient : public ConnectionToClient, |
Session* session() override; |
void Disconnect(ErrorCode error) override; |
void OnInputEventReceived(int64_t timestamp) override; |
- scoped_ptr<VideoStream> StartVideoStream( |
- scoped_ptr<webrtc::DesktopCapturer> desktop_capturer) override; |
+ std::unique_ptr<VideoStream> StartVideoStream( |
+ std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) override; |
AudioStub* audio_stub() override; |
ClientStub* client_stub() override; |
void set_clipboard_stub(ClipboardStub* clipboard_stub) override; |
@@ -76,16 +76,16 @@ class IceConnectionToClient : public ConnectionToClient, |
// Event handler for handling events sent from this object. |
ConnectionToClient::EventHandler* event_handler_; |
- scoped_ptr<Session> session_; |
+ std::unique_ptr<Session> session_; |
scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_; |
IceTransport transport_; |
- scoped_ptr<HostControlDispatcher> control_dispatcher_; |
- scoped_ptr<HostEventDispatcher> event_dispatcher_; |
- scoped_ptr<HostVideoDispatcher> video_dispatcher_; |
- scoped_ptr<AudioWriter> audio_writer_; |
+ std::unique_ptr<HostControlDispatcher> control_dispatcher_; |
+ std::unique_ptr<HostEventDispatcher> event_dispatcher_; |
+ std::unique_ptr<HostVideoDispatcher> video_dispatcher_; |
+ std::unique_ptr<AudioWriter> audio_writer_; |
DISALLOW_COPY_AND_ASSIGN(IceConnectionToClient); |
}; |