Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_server_session_base.h

 // Copyright (c) 2012 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.
 //
 // A server specific QuicSession subclass.
 
 #ifndef NET_QUIC_CORE_QUIC_SERVER_SESSION_BASE_H_
 #define NET_QUIC_CORE_QUIC_SERVER_SESSION_BASE_H_
 
 #include <cstdint>
@@ skipping 51 matching lines @@
   // Override base class to process bandwidth related config received from
   // client.
   void OnConfigNegotiated() override;
 
   void set_serving_region(const std::string& serving_region) {
     serving_region_ = serving_region;
   }
 
  protected:
   // QuicSession methods(override them with return type of QuicSpdyStream*):
-  QuicCryptoServerStreamBase* GetCryptoStream() override;
+  QuicCryptoServerStreamBase* GetMutableCryptoStream() override;
+
+  const QuicCryptoServerStreamBase* GetCryptoStream() const override;
 
   // If an outgoing stream can be created, return true.
   // Return false when connection is closed or forward secure encryption hasn't
   // established yet or number of server initiated streams already reaches the
   // upper limit.
   bool ShouldCreateOutgoingDynamicStream() override;
 
   // If we should create an incoming stream, returns true. Otherwise
   // does error handling, including communicating the error to the client and
   // possibly closing the connection, and returns false.
@@ skipping 44 matching lines @@
   // should go away once we fix http://b//27897982
   int32_t BandwidthToCachedParameterBytesPerSecond(
       const QuicBandwidth& bandwidth);
 
   DISALLOW_COPY_AND_ASSIGN(QuicServerSessionBase);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_QUIC_SERVER_SESSION_BASE_H_