Land Recent QUIC changes.

Moving QUIC over to the new QUIC/SPDY write blocked list template.
Fixing all QUIC streams to a single priority for now.

Merge internal change: 50911466

Factoring out the spdy write blocked logic into a utility Spdy and Quic
can share.

Merge internal change: 50897578

Moving the quic dispatcher from using the WriteBlockedList to using a
generic linked hash map, in preperation to adding priorities to the
WriteBlockedList.

Merge internal change: 50728003

QUIC dead code removal.

Merge internal change: 50710912

Clarify batch mode in packet generator.

Merge internal change: 50587122

Minor spacing/wording fixes to DLOG messages in quic_connection.

Merge internal change: 50574131

Define kDefaultRetransmissionTime once in QuicConnectionTest.

Merge internal change: 50571883

Deleted FramePackingAckResponse from chromium and will do the same on
server side in another CL.


Improve frame packing of acks and other frames when acks are received.

Merge internal change: 50521649

Fix TODO in quic_connection.cc

Merge internal change: 50515632

R=rch@chromium.org

Review URL: https://chromiumcodereview.appspot.com/22801008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218500 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/net/quic/quic_packet_generator.h b/net/quic/quic_packet_generator.h
index e8b09e6..f61e6e4 100644
--- a/net/quic/quic_packet_generator.h
+++ b/net/quic/quic_packet_generator.h
@@ -95,6 +95,8 @@ class NET_EXPORT_PRIVATE QuicPacketGenerator {
                                QuicStreamOffset offset,
                                bool fin);
 
+  // Indicates whether batch mode is currently enabled.
+  bool InBatchMode();
   // Disables flushing.
   void StartBatchOperations();
   // Enables flushing and flushes queued data.
@@ -126,7 +128,10 @@ class NET_EXPORT_PRIVATE QuicPacketGenerator {
 
   QuicPacketCreator* packet_creator_;
   QuicFrames queued_control_frames_;
-  bool should_flush_;
+
+  // True if batch mode is currently enabled.
+  bool batch_mode_;
+
   // Flags to indicate the need for just-in-time construction of a frame.
   bool should_send_ack_;
   bool should_send_feedback_;