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

Unified Diff: remoting/protocol/jingle_session.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/jingle_messages_unittest.cc ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session.h
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index 87a98c7b12e654e6d5eedf9d4679f777c92bff05..ae949399d1f4f51b536a0428cfc6ae5337df55bf 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -52,15 +52,16 @@ class JingleSession : public Session {
// Start connection by sending session-initiate message.
void StartConnection(const std::string& peer_jid,
- scoped_ptr<Authenticator> authenticator);
+ std::unique_ptr<Authenticator> authenticator);
// Called by JingleSessionManager for incoming connections.
- void InitializeIncomingConnection(const JingleMessage& initiate_message,
- scoped_ptr<Authenticator> authenticator);
+ void InitializeIncomingConnection(
+ const JingleMessage& initiate_message,
+ std::unique_ptr<Authenticator> authenticator);
void AcceptIncomingConnection(const JingleMessage& initiate_message);
// Callback for Transport interface to send transport-info messages.
- void SendTransportInfo(scoped_ptr<buzz::XmlElement> transport_info);
+ void SendTransportInfo(std::unique_ptr<buzz::XmlElement> transport_info);
// Sends |message| to the peer. The session is closed if the send fails or no
// response is received within a reasonable time. All other responses are
@@ -122,9 +123,9 @@ class JingleSession : public Session {
State state_;
ErrorCode error_;
- scoped_ptr<SessionConfig> config_;
+ std::unique_ptr<SessionConfig> config_;
- scoped_ptr<Authenticator> authenticator_;
+ std::unique_ptr<Authenticator> authenticator_;
Transport* transport_ = nullptr;
« no previous file with comments | « remoting/protocol/jingle_messages_unittest.cc ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698