Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/quartc/quartc_session.h

 // 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.
 
 #ifndef NET_QUIC_QUARTC_QUARTC_SESSION_H_
 #define NET_QUIC_QUARTC_QUARTC_SESSION_H_
 
 #include "net/quic/core/quic_crypto_client_stream.h"
 #include "net/quic/core/quic_crypto_server_stream.h"
 #include "net/quic/core/quic_crypto_stream.h"
@@ skipping 22 matching lines @@
       public QuicCryptoClientStream::ProofHandler {
  public:
   QuartcSession(std::unique_ptr<QuicConnection> connection,
                 const QuicConfig& config,
                 const std::string& unique_remote_server_id,
                 Perspective perspective,
                 QuicConnectionHelperInterface* helper);
   ~QuartcSession() override;
 
   // QuicSession overrides.
-  QuicCryptoStream* GetCryptoStream() override;
+  const QuicCryptoStream* GetCryptoStream() const override;
+  QuicCryptoStream* GetMutableCryptoStream() override;
 
   QuartcStream* CreateOutgoingDynamicStream(SpdyPriority priority) override;
 
   void OnCryptoHandshakeEvent(CryptoHandshakeEvent event) override;
 
   void CloseStream(QuicStreamId stream_id) override;
 
   // QuicConnectionVisitorInterface overrides.
   void OnConnectionClosed(QuicErrorCode error,
                           const std::string& error_details,
@@ skipping 61 matching lines @@
   std::unique_ptr<QuicCryptoClientConfig> quic_crypto_client_config_;
   // Config for QUIC crypto server stream, used by the server.
   std::unique_ptr<QuicCryptoServerConfig> quic_crypto_server_config_;
 
   DISALLOW_COPY_AND_ASSIGN(QuartcSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUARTC_QUARTC_SESSION_H_