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

Unified Diff: remoting/protocol/ssl_hmac_channel_authenticator.cc

Issue 570463002: Revert of Move PseudoTCP and channel auth out of LibjingleTransportFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clean_dgrams
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..d85ad5f17ed99db39f6e5c9755e35fdf114bacd2 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc
@@ -279,21 +279,13 @@
DCHECK(socket_.get() != NULL);
if (callback_called)
*callback_called = true;
-
- CallDoneCallback(net::OK, socket_.PassAs<net::StreamSocket>());
+ done_callback_.Run(net::OK, socket_.PassAs<net::StreamSocket>());
}
}
void SslHmacChannelAuthenticator::NotifyError(int error) {
- CallDoneCallback(error, scoped_ptr<net::StreamSocket>());
-}
-
-void SslHmacChannelAuthenticator::CallDoneCallback(
- int error,
- scoped_ptr<net::StreamSocket> socket) {
- DoneCallback callback = done_callback_;
- done_callback_.Reset();
- callback.Run(error, socket.Pass());
+ done_callback_.Run(static_cast<net::Error>(error),
+ scoped_ptr<net::StreamSocket>());
}
} // namespace protocol
« no previous file with comments | « remoting/protocol/ssl_hmac_channel_authenticator.h ('k') | remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698