Land Recent QUIC Changes.

net/quic/quic_session.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 QuicSession, which demuxes a single connection to individual streams.
 
 #ifndef NET_QUIC_QUIC_SESSION_H_
 #define NET_QUIC_QUIC_SESSION_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/linked_hash_map.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/quic_data_stream.h"
 #include "net/quic/quic_headers_stream.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_spdy_compressor.h"
 #include "net/quic/quic_spdy_decompressor.h"
+#include "net/quic/quic_write_blocked_list.h"
 #include "net/quic/reliable_quic_stream.h"
-#include "net/spdy/write_blocked_list.h"
 
 namespace net {
 
 class QuicCryptoStream;
 class ReliableQuicStream;
 class SSLInfo;
 class VisitorShim;
 
 namespace test {
 class QuicSessionPeer;
@@ skipping 22 matching lines @@
               const QuicConfig& config);
 
   virtual ~QuicSession();
 
   // QuicConnectionVisitorInterface methods:
   virtual bool OnStreamFrames(
       const std::vector<QuicStreamFrame>& frames) OVERRIDE;
   virtual void OnRstStream(const QuicRstStreamFrame& frame) OVERRIDE;
   virtual void OnGoAway(const QuicGoAwayFrame& frame) OVERRIDE;
   virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE;
+  virtual void OnWriteBlocked() OVERRIDE {}
   virtual void OnSuccessfulVersionNegotiation(
       const QuicVersion& version) OVERRIDE {}
   virtual void OnConfigNegotiated() OVERRIDE;
-  // Not needed for HTTP.
   virtual bool OnCanWrite() OVERRIDE;
   virtual bool HasPendingHandshake() const OVERRIDE;
 
   // Called by the headers stream when headers have been received for a stream.
   virtual void OnStreamHeaders(QuicStreamId stream_id,
                                base::StringPiece headers_data);
   // Called by the headers stream when headers with a priority have been
   // received for this stream.  This method will only be called for server
   // streams.
   virtual void OnStreamHeadersPriority(QuicStreamId stream_id,
@@ skipping 82 matching lines @@
   QuicPacketCreator::Options* options() { return connection()->options(); }
 
   // Returns the number of currently open streams, including those which have
   // been implicitly created.
   virtual size_t GetNumOpenStreams() const;
 
   void MarkWriteBlocked(QuicStreamId id, QuicPriority priority);
 
   // Returns true if the session has data to be sent, either queued in the
   // connection, or in a write-blocked stream.
-  bool HasQueuedData() const;
+  bool HasDataToWrite() const;
 
   // Marks that |stream_id| is blocked waiting to decompress the
   // headers identified by |decompression_id|.
   void MarkDecompressionBlocked(QuicHeaderId decompression_id,
                                 QuicStreamId stream_id);
 
   bool goaway_received() const {
     return goaway_received_;
   }
 
@@ skipping 111 matching lines @@
 
   // Map from StreamId to pointers to streams that are owned by the caller.
   DataStreamMap stream_map_;
   QuicStreamId next_stream_id_;
 
   // Set of stream ids that have been "implicitly created" by receipt
   // of a stream id larger than the next expected stream id.
   base::hash_set<QuicStreamId> implicitly_created_streams_;
 
   // A list of streams which need to write more data.
-  WriteBlockedList<QuicStreamId> write_blocked_streams_;
+  QuicWriteBlockedList write_blocked_streams_;
 
   // A map of headers waiting to be compressed, and the streams
   // they are associated with.
   map<uint32, QuicStreamId> decompression_blocked_streams_;
 
   QuicStreamId largest_peer_created_stream_id_;
 
   // The latched error with which the connection was closed.
   QuicErrorCode error_;
 
   // Whether a GoAway has been received.
   bool goaway_received_;
   // Whether a GoAway has been sent.
   bool goaway_sent_;
 
   // Indicate if there is pending data for the crypto stream.
   bool has_pending_handshake_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_