Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/quartc/quartc_session.cc

Index: net/quic/quartc/quartc_session.cc
diff --git a/net/quic/quartc/quartc_session.cc b/net/quic/quartc/quartc_session.cc
index 826e4d6e3a0b67915ba90193e3c91f20d6ac91e1..d3f3f5e4f67c0f8fc148e3e3cf05f535a2199d88 100644
--- a/net/quic/quartc/quartc_session.cc
+++ b/net/quic/quartc/quartc_session.cc
@@ -132,7 +132,11 @@ QuartcSession::QuartcSession(std::unique_ptr<QuicConnection> connection,
 
 QuartcSession::~QuartcSession() {}
 
-QuicCryptoStream* QuartcSession::GetCryptoStream() {
+const QuicCryptoStream* QuartcSession::GetCryptoStream() const {
+  return crypto_stream_.get();
+}
+
+QuicCryptoStream* QuartcSession::GetMutableCryptoStream() {
   return crypto_stream_.get();
 }