Land Recent QUIC changes.

net/quic/quic_packet_generator.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.
 //
 // Responsible for generating packets on behalf of a QuicConnection.
 // Packets are serialized just-in-time.  Control frames are queued.
 // Ack and Feedback frames will be requested from the Connection
 // just-in-time.  When a packet needs to be sent, the Generator
 // will serialize a packet and pass it to QuicConnection::SendOrQueuePacket()
 //
@@ skipping 69 matching lines @@
   QuicConsumedData ConsumeData(QuicStreamId id,
                                base::StringPiece data,
                                QuicStreamOffset offset,
                                bool fin);
 
   // Disables flushing.
   void StartBatchOperations();
   // Enables flushing and flushes queued data.
   void FinishBatchOperations();
 
-  bool HasQueuedData() const;
+  bool HasQueuedFrames() const;
 
  private:
-  void SendQueuedData();
+  void SendQueuedFrames();
 
-  bool HasPendingData() const;
+  bool HasPendingFrames() const;
   bool AddNextPendingFrame();
   void SerializeAndSendPacket();
 
   DelegateInterface* delegate_;
 
   QuicPacketCreator* packet_creator_;
   QuicFrames queued_control_frames_;
   bool should_flush_;
   bool should_send_ack_;
   scoped_ptr<QuicAckFrame> pending_ack_frame_;
   scoped_ptr<QuicCongestionFeedbackFrame> pending_feedback_frame_;
   bool should_send_feedback_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketGenerator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_GENERATOR_H_