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

Unified Diff: remoting/protocol/jingle_session_manager.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
Index: remoting/protocol/jingle_session_manager.cc
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index c726447dc602deb8119a24601e5cbbad5c171240..1adef6fcef20efd224e8555f0a87cd73aefdaeca 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -54,7 +54,7 @@ scoped_ptr<Session> JingleSessionManager::Connect(
scoped_ptr<JingleSession> session(new JingleSession(this));
session->StartConnection(host_jid, authenticator.Pass(), config.Pass());
sessions_[session->session_id_] = session.get();
- return session.PassAs<Session>();
+ return session.Pass();
}
void JingleSessionManager::Close() {

Powered by Google App Engine
This is Rietveld 408576698