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

Unified Diff: remoting/protocol/ice_transport_channel.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_transport.cc ('k') | remoting/protocol/ice_transport_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/ice_transport_channel.h
diff --git a/remoting/protocol/ice_transport_channel.h b/remoting/protocol/ice_transport_channel.h
index ca69d1f23dc6abbc3156eb749ef9f32fdc99ebda..f97f3ed9bc55696c9812b41474050c7b6cbfebd3 100644
--- a/remoting/protocol/ice_transport_channel.h
+++ b/remoting/protocol/ice_transport_channel.h
@@ -59,7 +59,8 @@ class IceTransportChannel : public sigslot::has_slots<> {
virtual void OnChannelDeleted(IceTransportChannel* transport) = 0;
};
- typedef base::Callback<void(scoped_ptr<P2PDatagramSocket>)> ConnectedCallback;
+ typedef base::Callback<void(std::unique_ptr<P2PDatagramSocket>)>
+ ConnectedCallback;
explicit IceTransportChannel(
scoped_refptr<TransportContext> transport_context);
@@ -86,7 +87,7 @@ class IceTransportChannel : public sigslot::has_slots<> {
private:
void OnPortAllocatorCreated(
- scoped_ptr<cricket::PortAllocator> port_allocator);
+ std::unique_ptr<cricket::PortAllocator> port_allocator);
void NotifyConnected();
@@ -113,12 +114,12 @@ class IceTransportChannel : public sigslot::has_slots<> {
ConnectedCallback callback_;
std::string ice_username_fragment_;
- scoped_ptr<cricket::PortAllocator> port_allocator_;
+ std::unique_ptr<cricket::PortAllocator> port_allocator_;
std::string remote_ice_username_fragment_;
std::string remote_ice_password_;
std::list<cricket::Candidate> pending_candidates_;
- scoped_ptr<cricket::P2PTransportChannel> channel_;
+ std::unique_ptr<cricket::P2PTransportChannel> channel_;
int connect_attempts_left_;
base::RepeatingTimer reconnect_timer_;
« no previous file with comments | « remoting/protocol/ice_transport.cc ('k') | remoting/protocol/ice_transport_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698