Landing Recent QUIC changes until and including Mon Nov 16 14:15:48 2015

net/quic/quic_session.h

Index: net/quic/quic_session.h
diff --git a/net/quic/quic_session.h b/net/quic/quic_session.h
index cbdfb05c9535a80d0e9d09398673391f0803be07..00d446ad742866c3657c357c009a899442d3f5ec 100644
--- a/net/quic/quic_session.h
+++ b/net/quic/quic_session.h
@@ -168,7 +168,7 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
   // connection-level flow control but not by its own stream-level flow control.
   // The stream will be given a chance to write when a connection-level
   // WINDOW_UPDATE arrives.
-  void MarkConnectionLevelWriteBlocked(QuicStreamId id, QuicPriority priority);
+  void MarkConnectionLevelWriteBlocked(QuicStreamId id, SpdyPriority priority);
 
   // Returns true if the session has data to be sent, either queued in the
   // connection, or in a write-blocked stream.
@@ -335,9 +335,6 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
   // Used for connection-level flow control.
   QuicFlowController flow_controller_;
 
-  // Indicate if there is pending data for the crypto stream.
-  bool has_pending_handshake_;
-
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };