Unify the QUIC dispatcher and make the QuicServer work.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 807bd4f02f58567d959eac72849a2973495a28ab..c39cb4687504181a84fc9f518748dc2097a47436 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -784,8 +784,6 @@
         'net',
       ],
       'sources': [
-        'quic/quic_dispatcher.cc',
-        'quic/quic_dispatcher.h',
         'quic/quic_per_connection_packet_writer.cc',
         'quic/quic_per_connection_packet_writer.h',
         'quic/quic_server.cc',
@@ -804,8 +802,12 @@
         'net',
       ],
       'sources': [
+        'tools/quic/quic_dispatcher.cc',
+        'tools/quic/quic_dispatcher.h',
         'tools/quic/quic_in_memory_cache.cc',
         'tools/quic/quic_in_memory_cache.h',
+        'tools/quic/quic_per_connection_packet_writer.cc',
+        'tools/quic/quic_per_connection_packet_writer.h',
         'tools/quic/quic_server_session.cc',
         'tools/quic/quic_server_session.h',
         'tools/quic/quic_simple_client.cc',
@@ -1241,8 +1243,6 @@
             'tools/quic/quic_client_session.h',
             'tools/quic/quic_default_packet_writer.cc',
             'tools/quic/quic_default_packet_writer.h',
-            'tools/quic/quic_dispatcher.cc',
-            'tools/quic/quic_dispatcher.h',
             'tools/quic/quic_epoll_clock.cc',
             'tools/quic/quic_epoll_clock.h',
             'tools/quic/quic_epoll_connection_helper.cc',
@@ -1251,8 +1251,6 @@
             'tools/quic/quic_packet_reader.h',
             'tools/quic/quic_packet_writer_wrapper.cc',
             'tools/quic/quic_packet_writer_wrapper.h',
-            'tools/quic/quic_per_connection_packet_writer.cc',
-            'tools/quic/quic_per_connection_packet_writer.h',
             'tools/quic/quic_server.cc',
             'tools/quic/quic_server.h',
             'tools/quic/quic_socket_utils.cc',