Landing recent QUIC changes until 6/24/2016 14:00 UTC

net/quic/quic_packet_creator.h

 // Copyright (c) 2012 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.
 //
 // Accumulates frames for the next packet until more frames no longer fit or
 // it's time to create a packet from them. If multipath enabled, only creates
 // packets on one path at the same time. Currently, next packet number is
 // tracked per-path.
 
 #ifndef NET_QUIC_QUIC_PACKET_CREATOR_H_
@@ skipping 15 matching lines @@
 namespace net {
 namespace test {
 class QuicPacketCreatorPeer;
 }
 
 class QuicRandom;
 
 class NET_EXPORT_PRIVATE QuicPacketCreator {
  public:
   // A delegate interface for further processing serialized packet.
-  class NET_EXPORT_PRIVATE DelegateInterface {
+  class NET_EXPORT_PRIVATE DelegateInterface
+      : public QuicConnectionCloseDelegateInterface {
    public:
-    virtual ~DelegateInterface() {}
+    ~DelegateInterface() override {}
     // Called when a packet is serialized. Delegate does not take the ownership
     // of |serialized_packet|, but takes ownership of any frames it removes
     // from |packet.retransmittable_frames|.
     virtual void OnSerializedPacket(SerializedPacket* serialized_packet) = 0;
-
-    // Called when an unrecoverable error is encountered.
-    virtual void OnUnrecoverableError(QuicErrorCode error,
-                                      const std::string& error_details,
-                                      ConnectionCloseSource source) = 0;
   };
 
   // Interface which gets callbacks from the QuicPacketCreator at interesting
   // points.  Implementations must not mutate the state of the creator
   // as a result of these callbacks.
   class NET_EXPORT_PRIVATE DebugDelegate {
    public:
     virtual ~DebugDelegate() {}
 
     // Called when a frame has been added to the current packet.
@@ skipping 291 matching lines @@
 
   // Map mapping path_id to last sent packet number on the path.
   std::unordered_map<QuicPathId, QuicPacketNumber> multipath_packet_number_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketCreator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_CREATOR_H_