Land Recent QUIC Changes.

net/tools/quic/quic_time_wait_list_manager.h

Index: net/tools/quic/quic_time_wait_list_manager.h
diff --git a/net/tools/quic/quic_time_wait_list_manager.h b/net/tools/quic/quic_time_wait_list_manager.h
index ca8e1ee2995fe685183075858dcbe562a503b4e9..bb1caf273a4c59c934eeb16899b7fe513c2531b6 100644
--- a/net/tools/quic/quic_time_wait_list_manager.h
+++ b/net/tools/quic/quic_time_wait_list_manager.h
@@ -103,11 +103,11 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface {
   // owner of the packet.
   void SendOrQueuePacket(QueuedPacket* packet);
 
-  // Should only be called when write_blocked_ == false. We only care if the
-  // writing was unsuccessful because the socket got blocked, which can be
-  // tested using write_blocked_ == true. In case of all other errors we drop
-  // the packet. Hence, we return void.
-  void WriteToWire(QueuedPacket* packet);
+  // Sends the packet out. Returns true if the packet was successfully consumed.
+  // If the writer got blocked and did not buffer the packet, we'll need to keep
+  // the packet and retry sending. In case of all other errors we drop the
+  // packet.
+  bool WriteToWire(QueuedPacket* packet);
 
   // Register the alarm with the epoll server to wake up at appropriate time.
   void SetGuidCleanUpAlarm();
@@ -153,10 +153,6 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface {
   // Interface that writes given buffer to the socket. Owned by the dispatcher.
   QuicPacketWriter* writer_;
 
-  // True if the underlying udp socket is write blocked, i.e will return EAGAIN
-  // on sendmsg.
-  bool is_write_blocked_;
-
   DISALLOW_COPY_AND_ASSIGN(QuicTimeWaitListManager);
 };