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

Unified Diff: remoting/protocol/ssl_hmac_channel_authenticator.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/ssl_hmac_channel_authenticator.cc
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.cc b/remoting/protocol/ssl_hmac_channel_authenticator.cc
index f4bedeadf93039d696fe769d943683f9d12270df..575f21584020989a69c5057dfab9493abd3f9343 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc
@@ -280,12 +280,12 @@ void SslHmacChannelAuthenticator::CheckDone(bool* callback_called) {
if (callback_called)
*callback_called = true;
- CallDoneCallback(net::OK, socket_.PassAs<net::StreamSocket>());
+ CallDoneCallback(net::OK, socket_.Pass());
}
}
void SslHmacChannelAuthenticator::NotifyError(int error) {
- CallDoneCallback(error, scoped_ptr<net::StreamSocket>());
+ CallDoneCallback(error, nullptr);
}
void SslHmacChannelAuthenticator::CallDoneCallback(

Powered by Google App Engine
This is Rietveld 408576698