Index: webrtc/p2p/quic/quicsession.cc |
diff --git a/webrtc/p2p/quic/quicsession.cc b/webrtc/p2p/quic/quicsession.cc |
index 41975287032885b0c2a7801f42ca826e38ed0f3d..281af5e3a745a254475f5c85b8d63949c8452384 100644 |
--- a/webrtc/p2p/quic/quicsession.cc |
+++ b/webrtc/p2p/quic/quicsession.cc |
@@ -20,7 +20,7 @@ |
namespace cricket { |
-QuicSession::QuicSession(scoped_ptr<net::QuicConnection> connection, |
+QuicSession::QuicSession(rtc::scoped_ptr<net::QuicConnection> connection, |
const net::QuicConfig& config) |
: net::QuicSession(connection.release(), config) {} |
@@ -54,7 +54,7 @@ bool QuicSession::ExportKeyingMaterial(base::StringPiece label, |
void QuicSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) { |
net::QuicSession::OnCryptoHandshakeEvent(event); |
if (event == HANDSHAKE_CONFIRMED) { |
- LOG(INFO) << "QuicSession handshake complete"; |
+ LOG(LS_INFO) << "QuicSession handshake complete"; |
RTC_DCHECK(IsEncryptionEstablished()); |
RTC_DCHECK(IsCryptoHandshakeConfirmed()); |
@@ -88,9 +88,11 @@ ReliableQuicStream* QuicSession::CreateDataStream(net::QuicStreamId id) { |
return new ReliableQuicStream(id, this); |
} |
-void QuicSession::OnConnectionClosed(net::QuicErrorCode error, bool from_peer) { |
- net::QuicSession::OnConnectionClosed(error, from_peer); |
- SignalConnectionClosed(error, from_peer); |
+void QuicSession::OnConnectionClosed(net::QuicErrorCode error, |
+ net::ConnectionCloseSource source) { |
+ net::QuicSession::OnConnectionClosed(error, source); |
+ SignalConnectionClosed(error, |
+ source == net::ConnectionCloseSource::FROM_PEER); |
} |
bool QuicSession::OnReadPacket(const char* data, size_t data_len) { |