Landing Recent QUIC changes until 2/12/2016 21:32 UTC

net/tools/quic/quic_dispatcher.cc

Index: net/tools/quic/quic_dispatcher.cc
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index bcfd92b4c8d66f3e79781270c8577e4781678056..28c31a8f70ed7730f99b424c0760a58114f38f75 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -443,13 +443,7 @@ QuicServerSessionBase* QuicDispatcher::CreateQuicSession(
 }
 
 QuicTimeWaitListManager* QuicDispatcher::CreateQuicTimeWaitListManager() {
-  if (FLAGS_quic_time_wait_list_manager_use_shared_writer) {
-    return new QuicTimeWaitListManager(writer_.get(), this, helper_.get());
-  } else {
-    time_wait_list_writer_.reset(CreatePerConnectionWriter());
-    return new QuicTimeWaitListManager(time_wait_list_writer_.get(), this,
-                                       helper_.get());
-  }
+  return new QuicTimeWaitListManager(writer_.get(), this, helper_.get());
 }
 
 bool QuicDispatcher::HandlePacketForTimeWait(