Port QuicServer to Chrome network stack

net/tools/quic/quic_time_wait_list_manager_test.cc

Index: net/tools/quic/quic_time_wait_list_manager_test.cc
diff --git a/net/tools/quic/quic_time_wait_list_manager_test.cc b/net/tools/quic/quic_time_wait_list_manager_test.cc
index 67abd5928f7104420daa84af54f218f78b1209fe..f034d6d2183782a8d1d1f1f96866c9e25276d4fe 100644
--- a/net/tools/quic/quic_time_wait_list_manager_test.cc
+++ b/net/tools/quic/quic_time_wait_list_manager_test.cc
@@ -231,7 +231,8 @@ TEST_F(QuicTimeWaitListManagerTest, SendConnectionClose) {
   const int kRandomSequenceNumber = 1;
   EXPECT_CALL(writer_, WritePacket(_, kConnectionCloseLength,
                                    server_address_.address(),
-                                   client_address_))
+                                   client_address_,
+                                   _))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));
 
   ProcessPacket(connection_id_, kRandomSequenceNumber);
@@ -242,7 +243,8 @@ TEST_F(QuicTimeWaitListManagerTest, SendPublicReset) {
   const int kRandomSequenceNumber = 1;
   EXPECT_CALL(writer_, WritePacket(_, _,
                                    server_address_.address(),
-                                   client_address_))
+                                   client_address_,
+                                   _))
       .With(Args<0, 1>(PublicResetPacketEq(connection_id_,
                                            kRandomSequenceNumber)))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK, 0)));
@@ -254,7 +256,7 @@ TEST_F(QuicTimeWaitListManagerTest, SendPublicResetWithExponentialBackOff) {
   AddConnectionId(connection_id_);
   for (int sequence_number = 1; sequence_number < 101; ++sequence_number) {
     if ((sequence_number & (sequence_number - 1)) == 0) {
-      EXPECT_CALL(writer_, WritePacket(_, _, _, _))
+      EXPECT_CALL(writer_, WritePacket(_, _, _, _, _))
           .WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));
     }
     ProcessPacket(connection_id_, sequence_number);
@@ -321,7 +323,8 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) {
   // Let first write through.
   EXPECT_CALL(writer_, WritePacket(_, _,
                                    server_address_.address(),
-                                   client_address_))
+                                   client_address_,
+                                   _))
       .With(Args<0, 1>(PublicResetPacketEq(connection_id,
                                            sequence_number)))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK, packet->length())));
@@ -330,7 +333,8 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) {
   // write block for the next packet.
   EXPECT_CALL(writer_, WritePacket(_, _,
                                    server_address_.address(),
-                                   client_address_))
+                                   client_address_,
+                                   _))
       .With(Args<0, 1>(PublicResetPacketEq(connection_id,
                                            sequence_number)))
       .WillOnce(DoAll(
@@ -349,7 +353,7 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) {
   scoped_ptr<QuicEncryptedPacket> other_packet(
       ConstructEncryptedPacket(
           ENCRYPTION_NONE, other_connection_id, other_sequence_number));
-  EXPECT_CALL(writer_, WritePacket(_, _, _, _))
+  EXPECT_CALL(writer_, WritePacket(_, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor_, OnWriteBlocked(&time_wait_list_manager_));
   ProcessPacket(other_connection_id, other_sequence_number);
@@ -358,13 +362,15 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) {
   writer_is_blocked_ = false;
   EXPECT_CALL(writer_, WritePacket(_, _,
                                    server_address_.address(),
-                                   client_address_))
+                                   client_address_,
+                                   _))
       .With(Args<0, 1>(PublicResetPacketEq(connection_id,
                                            sequence_number)))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK, packet->length())));
   EXPECT_CALL(writer_, WritePacket(_, _,
                                    server_address_.address(),
-                                   client_address_))
+                                   client_address_,
+                                   _))
       .With(Args<0, 1>(PublicResetPacketEq(other_connection_id,
                                            other_sequence_number)))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK,
@@ -408,7 +414,8 @@ TEST_F(QuicTimeWaitListManagerTest, AddConnectionIdTwice) {
   EXPECT_CALL(writer_, WritePacket(_,
                                    kConnectionCloseLength,
                                    server_address_.address(),
-                                   client_address_))
+                                   client_address_,
+                                   _))
       .WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));
 
   const int kRandomSequenceNumber = 1;