Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

net/quic/quic_sent_packet_manager.h

Index: net/quic/quic_sent_packet_manager.h
diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 6b953c4b436fc704cc4de43a5f4befb2d3808f2e..e7be658e7a565a88bba5cceca68cb9b3140f6648 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -95,12 +95,8 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
    public:
     virtual ~NetworkChangeVisitor() {}
 
-    // Called when congestion window may have changed.
-    virtual void OnCongestionWindowChange() = 0;
-
-    // Called when RTT may have changed, including when an RTT is read from
-    // the config.
-    virtual void OnRttChange() = 0;
+    // Called when congestion window or RTT may have changed.
+    virtual void OnCongestionChange() = 0;
 
     // Called with the path may be degrading. Note that the path may only be
     // temporarily degrading.
@@ -178,6 +174,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   // the number of bytes sent and if they were retransmitted.  Returns true if
   // the sender should reset the retransmission timer.
   virtual bool OnPacketSent(SerializedPacket* serialized_packet,
+                            QuicPathId /*original_path_id*/,
                             QuicPacketNumber original_packet_number,
                             QuicTime sent_time,
                             TransmissionType transmission_type,
@@ -240,6 +237,8 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   bool using_pacing() const { return using_pacing_; }
 
+  bool handshake_confirmed() const { return handshake_confirmed_; }
+
   void set_debug_delegate(DebugDelegate* debug_delegate) {
     debug_delegate_ = debug_delegate;
   }