| Index: remoting/protocol/ice_transport.h
|
| diff --git a/remoting/protocol/ice_transport.h b/remoting/protocol/ice_transport.h
|
| index e47fc3b546fe63af3538025e8408814a529cf91d..f25fe98e2784ec53b10bcef26d3ce2eb8e79f715 100644
|
| --- a/remoting/protocol/ice_transport.h
|
| +++ b/remoting/protocol/ice_transport.h
|
| @@ -91,19 +91,19 @@ class IceTransport : public Transport,
|
| SendTransportInfoCallback send_transport_info_callback_;
|
|
|
| ChannelsMap channels_;
|
| - scoped_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_;
|
| - scoped_ptr<SecureChannelFactory> secure_channel_factory_;
|
| - scoped_ptr<MessageChannelFactory> message_channel_factory_;
|
| + std::unique_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_;
|
| + std::unique_ptr<SecureChannelFactory> secure_channel_factory_;
|
| + std::unique_ptr<MessageChannelFactory> message_channel_factory_;
|
|
|
| - scoped_ptr<ChannelMultiplexer> channel_multiplexer_;
|
| - scoped_ptr<MessageChannelFactory> mux_channel_factory_;
|
| + std::unique_ptr<ChannelMultiplexer> channel_multiplexer_;
|
| + std::unique_ptr<MessageChannelFactory> mux_channel_factory_;
|
|
|
| // Pending remote transport info received before the local channels were
|
| // created.
|
| std::list<IceTransportInfo::IceCredentials> pending_remote_ice_credentials_;
|
| std::list<IceTransportInfo::NamedCandidate> pending_remote_candidates_;
|
|
|
| - scoped_ptr<IceTransportInfo> pending_transport_info_message_;
|
| + std::unique_ptr<IceTransportInfo> pending_transport_info_message_;
|
| base::OneShotTimer transport_info_timer_;
|
|
|
| base::WeakPtrFactory<IceTransport> weak_factory_;
|
|
|