Land Recent QUIC Changes.

net/quic/quic_server_session.h

 // Copyright 2014 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 server specific QuicSession subclass.
 
 #ifndef NET_QUIC_QUIC_SERVER_SESSION_H_
 #define NET_QUIC_QUIC_SERVER_SESSION_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_per_connection_packet_writer.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
 
 namespace net {
 
+namespace test {
+class QuicServerSessionPeer;
+}  // namespace test
+
 class QuicBlockedWriterInterface;
 class QuicConfig;
 class QuicConnection;
 class QuicCryptoServerConfig;
 class ReliableQuicStream;
 
-namespace test {
-class QuicServerSessionPeer;
-}  // namespace test
-
 // An interface from the session to the entity owning the session.
 // This lets the session notify its owner (the Dispatcher) when the connection
 // is closed or blocked.
 class QuicServerSessionVisitor {
  public:
   virtual ~QuicServerSessionVisitor() {}
 
   virtual void OnConnectionClosed(QuicConnectionId connection_id,
                                   QuicErrorCode error) = 0;
   virtual void OnWriteBlocked(QuicBlockedWriterInterface* blocked_writer) = 0;
@@ skipping 49 matching lines @@
   QuicServerSessionVisitor* visitor_;
 
   // The most recent bandwidth estimate sent to the client.
   QuicBandwidth bandwidth_estimate_sent_to_client_;
 
   // Text describing server location. Sent to the client as part of the bandwith
   // estimate in the source-address token. Optional, can be left empty.
   string serving_region_;
 
   // Time at which we send the last SCUP to the client.
-  QuicTime last_server_config_update_time_;
+  QuicTime last_scup_time_;
+
+  // Number of packets sent to the peer, at the time we last sent a SCUP.
+  int64 last_scup_sequence_number_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicServerSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SERVER_SESSION_H_