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

net/tools/quic/quic_dispatcher.cc

 // 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.
 
 #include "net/tools/quic/quic_dispatcher.h"
 
 #include <utility>
 
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
@@ skipping 425 matching lines @@
       connection_id, client_address, helper_.get(), CreatePerConnectionWriter(),
       /* owns_writer= */ true, Perspective::IS_SERVER, supported_versions_);
 
   QuicServerSessionBase* session =
       new QuicSimpleServerSession(config_, connection, this, crypto_config_);
   session->Initialize();
   return session;
 }
 
 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(
     const QuicPacketPublicHeader& header) {
   if (header.reset_flag) {
     // Public reset packets do not have packet numbers, so ignore the packet.
     return false;
   }
 
   // Switch the framer to the correct version, so that the packet number can
   // be parsed correctly.
   framer_.set_version(time_wait_list_manager_->GetQuicVersionFromConnectionId(
       header.connection_id));
 
   // Continue parsing the packet to extract the packet number.  Then
   // send it to the time wait manager in OnUnathenticatedHeader.
   return true;
 }
 
 QuicPacketWriter* QuicDispatcher::CreatePerConnectionWriter() {
   return new QuicPerConnectionPacketWriter(writer_.get());
 }
 
 void QuicDispatcher::SetLastError(QuicErrorCode error) {
   last_error_ = error;
 }
 
 }  // namespace net