Land Recent QUIC Changes.

net/quic/quic_connection_logger.h

 // Copyright (c) 2013 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.
 
 #ifndef NET_QUIC_QUIC_CONNECTION_LOGGER_H_
 #define NET_QUIC_QUIC_CONNECTION_LOGGER_H_
 
 #include <bitset>
 
 #include "net/base/ip_endpoint.h"
@@ skipping 17 matching lines @@
  public:
   explicit QuicConnectionLogger(const BoundNetLog& net_log);
 
   virtual ~QuicConnectionLogger();
 
   // QuicPacketGenerator::DebugDelegateInterface
   virtual void OnFrameAddedToPacket(const QuicFrame& frame) OVERRIDE;
 
   // QuicConnectionDebugVisitorInterface
   virtual void OnPacketSent(QuicPacketSequenceNumber sequence_number,
+                            QuicPacketSequenceNumber original_sequence_number,
                             EncryptionLevel level,
                             TransmissionType transmission_type,
                             const QuicEncryptedPacket& packet,
                             WriteResult result) OVERRIDE;
-  virtual void OnPacketRetransmitted(
-      QuicPacketSequenceNumber old_sequence_number,
-      QuicPacketSequenceNumber new_sequence_number) OVERRIDE;
   virtual void OnPacketReceived(const IPEndPoint& self_address,
                                 const IPEndPoint& peer_address,
                                 const QuicEncryptedPacket& packet) OVERRIDE;
   virtual void OnIncorrectConnectionId(
       QuicConnectionId connection_id) OVERRIDE;
   virtual void OnUndecryptablePacket() OVERRIDE;
   virtual void OnDuplicatePacket(QuicPacketSequenceNumber sequence_number)
       OVERRIDE;
   virtual void OnProtocolVersionMismatch(QuicVersion version) OVERRIDE;
   virtual void OnPacketHeader(const QuicPacketHeader& header) OVERRIDE;
@@ skipping 112 matching lines @@
   // The available type of connection (WiFi, 3G, etc.) when connection was first
   // used.
   const char* const connection_description_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionLogger);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONNECTION_LOGGER_H_