Unify the QUIC dispatcher and make the QuicServer work.

net/quic/quic_server.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 toy server, which listens on a specified address for QUIC traffic and
 // handles incoming responses.
 
 #ifndef NET_QUIC_QUIC_SERVER_H_
 #define NET_QUIC_QUIC_SERVER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_log.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_connection_helper.h"
 
 namespace net {
 
 
 namespace test {
 class QuicServerPeer;
 }  // namespace test
 
+namespace tools {
 class QuicDispatcher;
+}  // namespace tools
+
 class UDPServerSocket;
 
 class QuicServer {
  public:
   QuicServer(const QuicConfig& config,
              const QuicVersionVector& supported_versions);
 
   virtual ~QuicServer();
 
   // Start listening on the specified address. Returns an error code.
@@ skipping 13 matching lines @@
   void SetStrikeRegisterNoStartupPeriod() {
     crypto_config_.set_strike_register_no_startup_period();
   }
 
   // SetProofSource sets the ProofSource that will be used to verify the
   // server's certificate, and takes ownership of |source|.
   void SetProofSource(ProofSource* source) {
     crypto_config_.SetProofSource(source);
   }
 
-  QuicDispatcher* dispatcher() { return dispatcher_.get(); }
+  tools::QuicDispatcher* dispatcher() { return dispatcher_.get(); }
 
  private:
   friend class net::test::QuicServerPeer;
 
   // Initialize the internal state of the server.
   void Initialize();
 
   // Accepts data from the framer and demuxes clients to sessions.
-  scoped_ptr<QuicDispatcher> dispatcher_;
+  scoped_ptr<tools::QuicDispatcher> dispatcher_;
 
   // Used by the helper_ to time alarms.
   QuicClock clock_;
 
   // Used to manage the message loop.
   QuicConnectionHelper helper_;
 
   // Listening socket. Also used for outbound client communication.
   scoped_ptr<UDPServerSocket> socket_;
 
@@ skipping 30 matching lines @@
   NetLog net_log_;
 
   base::WeakPtrFactory<QuicServer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicServer);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SERVER_H_