Unify various QUIC server classes in net/quic and net/tools/quic.

net/quic/quic_dispatcher.h

 // Copyright 2014 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.
 //
 // A server side dispatcher which dispatches a given client's data to their
 // stream.
 
 #ifndef NET_QUIC_QUIC_DISPATCHER_H_
 #define NET_QUIC_QUIC_DISPATCHER_H_
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/linked_hash_map.h"
 #include "net/quic/quic_blocked_writer_interface.h"
 #include "net/quic/quic_connection_helper.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_server_packet_writer.h"
-#include "net/quic/quic_server_session.h"
-#include "net/quic/quic_time_wait_list_manager.h"
+#include "net/tools/quic/quic_server_session.h"
+#include "net/tools/quic/quic_time_wait_list_manager.h"
 
 namespace net {
 namespace test {
 class QuicDispatcherPeer;
 }  // namespace test
 
 class DeleteSessionsAlarm;
 class QuicConfig;
 class QuicCryptoServerConfig;
-class QuicServerSession;
 
 class ProcessPacketInterface {
  public:
   virtual ~ProcessPacketInterface() {}
   virtual void ProcessPacket(const IPEndPoint& server_address,
                              const IPEndPoint& client_address,
                              const QuicEncryptedPacket& packet) = 0;
 };
 
 class QuicDispatcher : public QuicBlockedWriterInterface,
-                       public QuicServerSessionVisitor,
+                       public tools::QuicServerSessionVisitor,
                        public ProcessPacketInterface {
  public:
   // Creates per-connection packet writers out of the QuicDispatcher's shared
   // QuicPacketWriter. The per-connection writers' IsWriteBlocked() state must
   // always be the same as the shared writer's IsWriteBlocked(), or else the
   // QuicDispatcher::OnCanWrite logic will not work. (This will hopefully be
   // cleaned up for bug 16950226.)
   class PacketWriterFactory {
    public:
     virtual ~PacketWriterFactory() {}
@@ skipping 55 matching lines @@
 
   // Called whenever the QuicTimeWaitListManager adds a new connection to the
   // time-wait list.
   void OnConnectionAddedToTimeWaitList(QuicConnectionId connection_id) override;
 
   // Called whenever the QuicTimeWaitListManager removes an old connection from
   // the time-wait list.
   void OnConnectionRemovedFromTimeWaitList(
       QuicConnectionId connection_id) override;
 
-  typedef base::hash_map<QuicConnectionId, QuicServerSession*> SessionMap;
+  typedef base::hash_map<QuicConnectionId,
+                         tools::QuicServerSession*> SessionMap;
 
   // Deletes all sessions on the closed session list and clears the list.
   void DeleteSessions();
 
   const SessionMap& session_map() const { return session_map_; }
 
  protected:
-  virtual QuicServerSession* CreateQuicSession(
+  virtual tools::QuicServerSession* CreateQuicSession(
       QuicConnectionId connection_id,
       const IPEndPoint& server_address,
       const IPEndPoint& client_address);
 
   // Called by |framer_visitor_| when the public header has been parsed.
   virtual bool OnUnauthenticatedPublicHeader(
       const QuicPacketPublicHeader& header);
 
   // Called by OnUnauthenticatedPublicHeader when the packet is not for a
   // connection that the dispatcher has a record of, but is not handled by
   // certain simple processing rules.  This method may apply validity checks to
   // reject stray packets.  If the packet appears to be valid, it calls
   // CreateQuicSession to create a new session for the packet.  Returns the
   // QuicServerSession that was created, or nullptr if the packet failed the
   // validity checks.
-  virtual QuicServerSession* AdditionalValidityChecksThenCreateSession(
+  virtual tools::QuicServerSession* AdditionalValidityChecksThenCreateSession(
       const QuicPacketPublicHeader& header,
       QuicConnectionId connection_id);
 
   // Create and return the time wait list manager for this dispatcher, which
   // will be owned by the dispatcher as time_wait_list_manager_
-  virtual QuicTimeWaitListManager* CreateQuicTimeWaitListManager();
+  virtual tools::QuicTimeWaitListManager* CreateQuicTimeWaitListManager();
 
-  QuicTimeWaitListManager* time_wait_list_manager() {
+  tools::QuicTimeWaitListManager* time_wait_list_manager() {
     return time_wait_list_manager_.get();
   }
 
   const QuicVersionVector& supported_versions() const {
     return supported_versions_;
   }
 
   const IPEndPoint& current_server_address() {
     return current_server_address_;
   }
@@ skipping 50 matching lines @@
   const QuicConfig& config_;
 
   const QuicCryptoServerConfig& crypto_config_;
 
   // The list of connections waiting to write.
   WriteBlockedList write_blocked_list_;
 
   SessionMap session_map_;
 
   // Entity that manages connection_ids in time wait state.
-  scoped_ptr<QuicTimeWaitListManager> time_wait_list_manager_;
+  scoped_ptr<tools::QuicTimeWaitListManager> time_wait_list_manager_;
 
   // The helper used for all connections. Owned by the server.
   QuicConnectionHelperInterface* helper_;
 
   // An alarm which deletes closed sessions.
   scoped_ptr<QuicAlarm> delete_sessions_alarm_;
 
   // The list of closed but not-yet-deleted sessions.
-  std::list<QuicServerSession*> closed_session_list_;
+  std::list<tools::QuicServerSession*> closed_session_list_;
 
   // The writer to write to the socket with.
   scoped_ptr<QuicServerPacketWriter> writer_;
 
   // Used to create per-connection packet writers, not |writer_| itself.
   scoped_ptr<PacketWriterFactory> packet_writer_factory_;
 
   // Passed in to QuicConnection for it to create the per-connection writers
   PacketWriterFactoryAdapter connection_writer_factory_;
 
@@ skipping 10 matching lines @@
 
   QuicFramer framer_;
   scoped_ptr<QuicFramerVisitor> framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_DISPATCHER_H_