Break reliance of QuicDispatcher on QuicServerSessionBase

net/tools/quic/quic_dispatcher.h

Index: net/tools/quic/quic_dispatcher.h
diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h
index d6d284f0dbe4e7217ad4ccf79a65dfb8e405739a..8f5db502c5d0fff2131f55bd72bf38b1fe78836b 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -22,7 +22,7 @@
 #include "net/quic/core/quic_connection.h"
 #include "net/quic/core/quic_crypto_server_stream.h"
 #include "net/quic/core/quic_protocol.h"
-#include "net/quic/core/quic_server_session_base.h"
+#include "net/quic/core/quic_session.h"
 
 #include "net/tools/quic/quic_process_packet_interface.h"
 #include "net/tools/quic/quic_time_wait_list_manager.h"
@@ -89,11 +89,10 @@ class QuicDispatcher : public QuicServerSessionBase::Visitor,
   // time-wait list.
   void OnConnectionAddedToTimeWaitList(QuicConnectionId connection_id) override;
 
-  void OnPacketBeingDispatchedToSession(
-      QuicServerSessionBase* session) override {}
+  void OnPacketBeingDispatchedToSession(QuicSession* session) override {}
 
-  using SessionMap = std::unordered_map<QuicConnectionId,
-                                        std::unique_ptr<QuicServerSessionBase>>;
+  using SessionMap =
+      std::unordered_map<QuicConnectionId, std::unique_ptr<QuicSession>>;
 
   const SessionMap& session_map() const { return session_map_; }
 
@@ -158,9 +157,8 @@ class QuicDispatcher : public QuicServerSessionBase::Visitor,
   virtual bool HasChlosBuffered() const;
 
  protected:
-  virtual QuicServerSessionBase* CreateQuicSession(
-      QuicConnectionId connection_id,
-      const IPEndPoint& client_address) = 0;
+  virtual QuicSession* CreateQuicSession(QuicConnectionId connection_id,
+                                         const IPEndPoint& client_address) = 0;
 
   // Called when a connection is rejected statelessly.
   virtual void OnConnectionRejectedStatelessly();
@@ -293,7 +291,7 @@ class QuicDispatcher : public QuicServerSessionBase::Visitor,
   // Deliver |packets| to |session| for further processing.
   void DeliverPacketsToSession(
       const std::list<QuicBufferedPacketStore::BufferedPacket>& packets,
-      QuicServerSessionBase* session);
+      QuicSession* session);
 
   // Perform the appropriate actions on the current packet based on |fate| -
   // either process, buffer, or drop it.
@@ -337,8 +335,8 @@ class QuicDispatcher : public QuicServerSessionBase::Visitor,
   // Entity that manages connection_ids in time wait state.
   std::unique_ptr<QuicTimeWaitListManager> time_wait_list_manager_;
 
-  // The list of closed but not-yet-deleted sessions.
-  std::vector<std::unique_ptr<QuicServerSessionBase>> closed_session_list_;
+  // The std::list of closed but not-yet-deleted sessions.
+  std::vector<std::unique_ptr<QuicSession>> closed_session_list_;
 
   // The helper used for all connections.
   std::unique_ptr<QuicConnectionHelperInterface> helper_;