Revert 204046 "Land Recent QUIC changes."

> Land Recent QUIC changes.
> 
> Merge internal change: 47341065
> 
> Fix to ensure the version matches before declaring that the public header
> flags exceed the max value. b/9190456
> 
> Merge internal change: 47324563
> 
> Fixing another backup bug (exposed by the last fix) that if we failed to
> write a standalone fin the stream would not be marked as write blocked.
> 
> Merge internal change: 47272116
> 
> Don't add QuicStreams to ActiveSessionList; Instead call DumpSession on
> alive streams via QuicSession.
> 
> Merge internal change: 47226512
> 
> Making the packet sequence number variable length to minimize bytes on the wire.
> 
> Merge internal change: 47220850
> 
> Fixing a bug in quic stream where we'd send rst stream packets for
> successful streams. The fin bit should be sufficient for both good
> request/response pairs and early response pairs.
> 
> Merge internal change: 47086343
> 
> Don't let FEC packets consume congestion window forever. If a FEC packet
> is not acked after a certain time, it is cleared from the congestion
> window. This timeout is higher than normal RTO.
> 
> Merge internal change: 47056082
> 
> Add QuicSession to ActiveSessionList.
> 
> Merge internal change: 47048300
> 
> Fixing a backup/resumption bug in QUIC.
> 
> It's possible to have a full congestion window worth of packets on the wire.
> 
> If we are in this state and a session tries to SendStreamData, the
> QuicPacketGenerator short-circuits without queuing packets because it checks
> to see if the connection CanWrite.
> 
> When we get an ack, we check to see if we have locally queued packets, but
> never call OnCanWrite on the session to clear any streams which write blocked
> without queueing packets.
> 
> Merge internal change: 47000173
> 
> QUIC: wire up the server-nonce parameters to the server config.
> 
> Merge internal change: 46985067
> 
> R=rch@chromium.org
> 
> Review URL: https://codereview.chromium.org/16256017

TBR=rtenneti@chromium.org

Review URL: https://codereview.chromium.org/16374004

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

1 files changed, 5 insertions, 9 deletions

diff --git a/net/quic/quic_packet_creator.h b/net/quic/quic_packet_creator.h
index 86a5c0e..cb58625 100644
--- a/net/quic/quic_packet_creator.h
+++ b/net/quic/quic_packet_creator.h
@@ -33,8 +33,7 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
         : max_packet_length(kMaxPacketSize),
           random_reorder(false),
           max_packets_per_fec_group(0),
-          send_guid_length(PACKET_8BYTE_GUID),
-          send_sequence_number_length(PACKET_6BYTE_SEQUENCE_NUMBER) {
+          send_guid_length(PACKET_8BYTE_GUID) {
     }
 
     size_t max_packet_length;
@@ -43,7 +42,6 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
     size_t max_packets_per_fec_group;
     // Length of guid to send over the wire.
     QuicGuidLength send_guid_length;
-    QuicSequenceNumberLength send_sequence_number_length;
   };
 
   // QuicRandom* required for packet entropy.
@@ -70,12 +68,10 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
   void StopSendingVersion();
 
   // The overhead the framing will add for a packet with num_frames frames.
-  static size_t StreamFramePacketOverhead(
-      int num_frames,
-      QuicGuidLength guid_length,
-      bool include_version,
-      QuicSequenceNumberLength sequence_number_length,
-      InFecGroup is_in_fec_group);
+  static size_t StreamFramePacketOverhead(int num_frames,
+                                          QuicGuidLength guid_length,
+                                          bool include_version,
+                                          InFecGroup is_in_fec_group);
 
   bool HasRoomForStreamFrame() const;