Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1086)

Unified Diff: remoting/protocol/ice_transport.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/ice_connection_to_host.cc ('k') | remoting/protocol/ice_transport.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « remoting/protocol/ice_connection_to_host.cc ('k') | remoting/protocol/ice_transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698