Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000

net/tools/quic/quic_client_session.h

Index: net/tools/quic/quic_client_session.h
diff --git a/net/tools/quic/quic_client_session.h b/net/tools/quic/quic_client_session.h
index 8dbdf2c03510ec64071e4e7885468890d8b3b402..a7dc18043071ea01a80a0360ff698836d4a56d3a 100644
--- a/net/tools/quic/quic_client_session.h
+++ b/net/tools/quic/quic_client_session.h
@@ -37,6 +37,8 @@ class QuicClientSession : public QuicClientSessionBase {
   // QuicSession methods:
   QuicSpdyClientStream* CreateOutgoingDynamicStream(
       SpdyPriority priority) override;
+  QuicSpdyClientStream* MaybeCreateOutgoingDynamicStream(
+      SpdyPriority priority) override;
   QuicCryptoClientStreamBase* GetMutableCryptoStream() override;
   const QuicCryptoClientStreamBase* GetCryptoStream() const override;
 
@@ -57,10 +59,6 @@ class QuicClientSession : public QuicClientSessionBase {
 
   int GetNumReceivedServerConfigUpdates() const;
 
-  void set_respect_goaway(bool respect_goaway) {
-    respect_goaway_ = respect_goaway;
-  }
-
  protected:
   // QuicSession methods:
   QuicSpdyStream* CreateIncomingDynamicStream(QuicStreamId id) override;
@@ -69,10 +67,14 @@ class QuicClientSession : public QuicClientSessionBase {
 
   // If an incoming stream can be created, return true.
   bool ShouldCreateIncomingDynamicStream(QuicStreamId id) override;
+  QuicSpdyStream* MaybeCreateIncomingDynamicStream(QuicStreamId id) override;
+  std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) override;
 
   // Create the crypto stream. Called by Initialize().
   virtual std::unique_ptr<QuicCryptoClientStreamBase> CreateQuicCryptoStream();
 
+  // TODO(ckrasic) remove when
+  // quic_reloadable_flag_quic_refactor_stream_creation is deprecated.
   // Unlike CreateOutgoingDynamicStream, which applies a bunch of sanity checks,
   // this simply returns a new QuicSpdyClientStream. This may be used by
   // subclasses which want to use a subclass of QuicSpdyClientStream for streams
@@ -87,10 +89,6 @@ class QuicClientSession : public QuicClientSessionBase {
   QuicServerId server_id_;
   QuicCryptoClientConfig* crypto_config_;
 
-  // If this is set to false, the client will ignore server GOAWAYs and allow
-  // the creation of streams regardless of the high chance they will fail.
-  bool respect_goaway_;
-
   DISALLOW_COPY_AND_ASSIGN(QuicClientSession);
 };