Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

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/base/net_export.h"
 #include "net/quic/core/quic_crypto_client_stream.h"
 #include "net/quic/core/quic_crypto_server_stream.h"
@@ skipping 71 matching lines @@
       const ProofVerifyDetails& verify_details) override;
 
   // Override the default crypto configuration.
   // The session will take the ownership of the configurations.
   void SetClientCryptoConfig(QuicCryptoClientConfig* client_config);
 
   void SetServerCryptoConfig(QuicCryptoServerConfig* server_config);
 
  protected:
   // QuicSession override.
-  ReliableQuicStream* CreateIncomingDynamicStream(QuicStreamId id) override;
+  QuicStream* CreateIncomingDynamicStream(QuicStreamId id) override;
 
   QuartcStream* CreateDataStream(QuicStreamId id, SpdyPriority priority);
 
  private:
   // For crypto handshake.
   std::unique_ptr<QuicCryptoStream> crypto_stream_;
   // For recording packet receipt time
   QuicClock clock_;
   const std::string unique_remote_server_id_;
   Perspective perspective_;
@@ skipping 11 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_