Revert of Landing Recent QUIC Changes.

net/quic/quic_connection.h

Index: net/quic/quic_connection.h
diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h
index 3b84205474ba04570272dd52cd1c9b526af8d582..0f083536d6c84a44e2e922540018df2bd311b7a2 100644
--- a/net/quic/quic_connection.h
+++ b/net/quic/quic_connection.h
@@ -204,9 +204,6 @@
 
   // Called when the connection is closed.
   virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) {}
-
-  // Called when the version negotiation is successful.
-  virtual void OnSuccessfulVersionNegotiation(const QuicVersion& version) {}
 };
 
 class NET_EXPORT_PRIVATE QuicConnectionHelperInterface {
@@ -231,6 +228,12 @@
       public QuicPacketGenerator::DelegateInterface,
       public QuicSentPacketManager::NetworkChangeVisitor {
  public:
+  enum PacketType {
+    NORMAL,
+    QUEUED,
+    CONNECTION_CLOSE
+  };
+
   enum AckBundling {
     NO_ACK = 0,
     SEND_ACK = 1,
@@ -564,9 +567,14 @@
                  EncryptionLevel level,
                  TransmissionType transmission_type);
 
-    SerializedPacket serialized_packet;
+    QuicPacketSequenceNumber sequence_number;
+    QuicPacket* packet;
     const EncryptionLevel encryption_level;
     TransmissionType transmission_type;
+    HasRetransmittableData retransmittable;
+    IsHandshake handshake;
+    PacketType type;
+    QuicByteCount length;
   };
 
   typedef std::list<QueuedPacket> QueuedPacketList;
@@ -656,9 +664,6 @@
   // changed since the last packet we saw on this connection.
   void CheckForAddressMigration(const IPEndPoint& self_address,
                                 const IPEndPoint& peer_address);
-
-  HasRetransmittableData IsRetransmittable(QueuedPacket packet);
-  bool IsConnectionClose(QueuedPacket packet);
 
   QuicFramer framer_;
   QuicConnectionHelperInterface* helper_;  // Not owned.
@@ -688,7 +693,6 @@
   std::vector<QuicGoAwayFrame> last_goaway_frames_;
   std::vector<QuicWindowUpdateFrame> last_window_update_frames_;
   std::vector<QuicBlockedFrame> last_blocked_frames_;
-  std::vector<QuicPingFrame> last_ping_frames_;
   std::vector<QuicConnectionCloseFrame> last_close_frames_;
 
   QuicCongestionFeedbackFrame outgoing_congestion_feedback_;