Update QuicTransportChannel to latest version of libquic (Chromium: f03d2c62)

webrtc/p2p/quic/quicsession.cc

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 28 matching lines @@
   net::QuicSession::Initialize();
 }
 
 void QuicSession::SetCryptoStream(net::QuicCryptoStream* crypto_stream) {
   crypto_stream_.reset(crypto_stream);
 }
 
 bool QuicSession::ExportKeyingMaterial(base::StringPiece label,
                                        base::StringPiece context,
                                        size_t result_len,
-                                       string* result) {
+                                       std::string* result) {
   return crypto_stream_->ExportKeyingMaterial(label, context, result_len,
                                               result);
 }
 
 void QuicSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   net::QuicSession::OnCryptoHandshakeEvent(event);
   if (event == HANDSHAKE_CONFIRMED) {
     LOG(LS_INFO) << "QuicSession handshake complete";
     RTC_DCHECK(IsEncryptionEstablished());
     RTC_DCHECK(IsCryptoHandshakeConfirmed());
 
     SignalHandshakeComplete();
   }
 }
 
 ReliableQuicStream* QuicSession::CreateIncomingDynamicStream(
     net::QuicStreamId id) {
   ReliableQuicStream* stream = CreateDataStream(id);
   if (stream) {
     SignalIncomingStream(stream);
   }
   return stream;
 }
 
 ReliableQuicStream* QuicSession::CreateOutgoingDynamicStream(
     net::SpdyPriority priority) {
-  ReliableQuicStream* stream = CreateDataStream(GetNextOutgoingStreamId());
-  if (stream) {
-    ActivateStream(stream);  // QuicSession owns the stream.
-  }
-  return stream;
+  return CreateDataStream(GetNextOutgoingStreamId());
 }
 
 ReliableQuicStream* QuicSession::CreateDataStream(net::QuicStreamId id) {
   if (crypto_stream_ == nullptr || !crypto_stream_->encryption_established()) {
     // Encryption not active so no stream created
     return nullptr;
   }
-  return new ReliableQuicStream(id, this);
+  ReliableQuicStream* stream = new ReliableQuicStream(id, this);
+  if (stream) {
+    ActivateStream(stream);  // QuicSession owns the stream.
+  }
+  return stream;
 }
 
 void QuicSession::OnConnectionClosed(net::QuicErrorCode error,
+                                     const std::string& error_details,
                                      net::ConnectionCloseSource source) {
-  net::QuicSession::OnConnectionClosed(error, source);
+  net::QuicSession::OnConnectionClosed(error, error_details, source);
   SignalConnectionClosed(error,
                          source == net::ConnectionCloseSource::FROM_PEER);
 }
 
 bool QuicSession::OnReadPacket(const char* data, size_t data_len) {
-  net::QuicEncryptedPacket packet(data, data_len);
-  connection()->ProcessUdpPacket(connection()->self_address(),
-                                 connection()->peer_address(), packet);
+  net::QuicReceivedPacket packet(data, data_len, clock_.Now());
+  ProcessUdpPacket(connection()->self_address(), connection()->peer_address(),
+                   packet);
   return true;
 }
 
 }  // namespace cricket