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

Unified Diff: remoting/protocol/libjingle_transport_factory.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/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 404415058fdd170f8dddb5225a30173cfe9f5b11..0fe0c106b3d6a4bea6b5ef4c3f87813b8d7314df 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -194,7 +194,7 @@ void LibjingleTransport::NotifyConnected() {
Transport::ConnectedCallback callback = callback_;
callback_.Reset();
- callback.Run(socket.PassAs<net::Socket>());
+ callback.Run(socket.Pass());
}
void LibjingleTransport::AddRemoteCandidate(
@@ -353,7 +353,7 @@ scoped_ptr<Transport> LibjingleTransportFactory::CreateTransport() {
result->OnCanStart();
}
- return result.PassAs<Transport>();
+ return result.Pass();
}
void LibjingleTransportFactory::EnsureFreshJingleInfo() {

Powered by Google App Engine
This is Rietveld 408576698