Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/quartc/quartc_session.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quartc/quartc_session.h"
 
 #include "base/rand_util.h"
 #include "net/quic/platform/api/quic_string_piece.h"
 
 namespace {
@@ skipping 114 matching lines @@
     // The |message| is used to handle the return value of AddDefaultConfig
     // which is raw pointer of the CryptoHandshakeMessage.
     std::unique_ptr<CryptoHandshakeMessage> message(
         quic_crypto_server_config_->AddDefaultConfig(
             helper_->GetRandomGenerator(), helper_->GetClock(), options));
   }
 }
 
 QuartcSession::~QuartcSession() {}
 
-QuicCryptoStream* QuartcSession::GetCryptoStream() {
+const QuicCryptoStream* QuartcSession::GetCryptoStream() const {
   return crypto_stream_.get();
 }
 
+QuicCryptoStream* QuartcSession::GetMutableCryptoStream() {
+  return crypto_stream_.get();
+}
+
 QuartcStream* QuartcSession::CreateOutgoingDynamicStream(
     SpdyPriority priority) {
   return CreateDataStream(GetNextOutgoingStreamId(), priority);
 }
 
 void QuartcSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   QuicSession::OnCryptoHandshakeEvent(event);
   if (event == HANDSHAKE_CONFIRMED) {
     DCHECK(IsEncryptionEstablished());
     DCHECK(IsCryptoHandshakeConfirmed());
@@ skipping 127 matching lines @@
     ActivateStream(std::unique_ptr<QuicStream>(stream));
     // Register the stream to the QuicWriteBlockedList. |priority| is clamped
     // between 0 and 7, with 0 being the highest priority and 7 the lowest
     // priority.
     write_blocked_streams()->RegisterStream(stream->id(), priority);
   }
   return stream;
 }
 
 }  // namespace net