Port QuicServer to Chrome network stack

net/quic/quic_server_packet_writer.cc

Index: net/quic/quic_server_packet_writer.cc
diff --git a/net/quic/quic_server_packet_writer.cc b/net/quic/quic_server_packet_writer.cc
index c2635b699eb3efd06713015d8ba6fcd1a2d93a4e..6afea35cfd1f6380dc1205a6ce4b54c5f320bc55 100644
--- a/net/quic/quic_server_packet_writer.cc
+++ b/net/quic/quic_server_packet_writer.cc
@@ -6,18 +6,20 @@
 
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "base/metrics/sparse_histogram.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "net/quic/crypto/quic_random.h"
 
 namespace net {
 
-QuicServerPacketWriter::QuicServerPacketWriter() : weak_factory_(this) {
-}
-
-QuicServerPacketWriter::QuicServerPacketWriter(UDPServerSocket* socket)
+QuicServerPacketWriter::QuicServerPacketWriter(
+    QuicBlockedWriterInterface* blocked_writer,
+    UDPServerSocket* socket)
     : weak_factory_(this),
       socket_(socket),
+      blocked_writer_(blocked_writer),
       write_blocked_(false) {
 }
 
@@ -26,8 +28,8 @@ QuicServerPacketWriter::~QuicServerPacketWriter() {
 
 WriteResult QuicServerPacketWriter::WritePacket(
     const char* buffer, size_t buf_len,
-    const net::IPAddressNumber& self_address,
-    const net::IPEndPoint& peer_address) {
+    const IPAddressNumber& self_address,
+    const IPEndPoint& peer_address) {
   scoped_refptr<StringIOBuffer> buf(
       new StringIOBuffer(std::string(buffer, buf_len)));
   DCHECK(!IsWriteBlocked());
@@ -46,7 +48,6 @@ WriteResult QuicServerPacketWriter::WritePacket(
       write_blocked_ = true;
     }
   }
-
   return WriteResult(status, rv);
 }
 
@@ -67,8 +68,10 @@ void QuicServerPacketWriter::OnWriteComplete(int rv) {
   DCHECK_NE(rv, ERR_IO_PENDING);
   write_blocked_ = false;
   WriteResult result(rv < 0 ? WRITE_STATUS_ERROR : WRITE_STATUS_OK, rv);
-  connection_->OnPacketSent(result);
-  connection_->OnCanWrite();
+  if (!callback_.is_null()) {
+    callback_.Run(result);

[Ryan Hamilton, 2014/06/19 19:21:29]

Is it expected that callback_ can be NULL here?

[dmz, 2014/06/19 20:06:28]

You're right, not anymore.

+  }
+  blocked_writer_->OnCanWrite();
 }
 
 }  // namespace net