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

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 4c76d95715078617e31aa4ba781d4aef02803f6f..b9bcbecb5bd95cef920779a2af24201d61da719d 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -782,24 +782,17 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../url/url.gyp:url_lib',
         'net',
+        'simple_quic_tools',
       ],
       'sources': [
         'quic/quic_dispatcher.cc',
         'quic/quic_dispatcher.h',
-        'quic/quic_in_memory_cache.cc',
-        'quic/quic_in_memory_cache.h',
         'quic/quic_per_connection_packet_writer.cc',
         'quic/quic_per_connection_packet_writer.h',
         'quic/quic_server.cc',
         'quic/quic_server.h',
         'quic/quic_server_packet_writer.cc',
         'quic/quic_server_packet_writer.h',
-        'quic/quic_server_session.cc',
-        'quic/quic_server_session.h',
-        'quic/quic_spdy_server_stream.cc',
-        'quic/quic_spdy_server_stream.h',
-        'quic/quic_time_wait_list_manager.cc',
-        'quic/quic_time_wait_list_manager.h',
       ],
     },
     {
@@ -812,12 +805,20 @@
         'net',
       ],
       'sources': [
+        'tools/quic/quic_in_memory_cache.cc',
+        'tools/quic/quic_in_memory_cache.h',
+        'tools/quic/quic_server_session.cc',
+        'tools/quic/quic_server_session.h',
         'tools/quic/quic_simple_client.cc',
         'tools/quic/quic_simple_client.h',
         'tools/quic/quic_client_session.cc',
         'tools/quic/quic_client_session.h',
         'tools/quic/quic_spdy_client_stream.cc',
         'tools/quic/quic_spdy_client_stream.h',
+        'tools/quic/quic_spdy_server_stream.cc',
+        'tools/quic/quic_spdy_server_stream.h',
+        'tools/quic/quic_time_wait_list_manager.cc',
+        'tools/quic/quic_time_wait_list_manager.h',
         'tools/quic/synchronous_host_resolver.cc',
         'tools/quic/synchronous_host_resolver.h',
       ],
@@ -1245,8 +1246,6 @@
             'tools/quic/quic_epoll_clock.h',
             'tools/quic/quic_epoll_connection_helper.cc',
             'tools/quic/quic_epoll_connection_helper.h',
-            'tools/quic/quic_in_memory_cache.cc',
-            'tools/quic/quic_in_memory_cache.h',
             'tools/quic/quic_packet_reader.cc',
             'tools/quic/quic_packet_reader.h',
             'tools/quic/quic_packet_writer_wrapper.cc',
@@ -1255,14 +1254,8 @@
             'tools/quic/quic_per_connection_packet_writer.h',
             'tools/quic/quic_server.cc',
             'tools/quic/quic_server.h',
-            'tools/quic/quic_server_session.cc',
-            'tools/quic/quic_server_session.h',
             'tools/quic/quic_socket_utils.cc',
             'tools/quic/quic_socket_utils.h',
-            'tools/quic/quic_spdy_server_stream.cc',
-            'tools/quic/quic_spdy_server_stream.h',
-            'tools/quic/quic_time_wait_list_manager.cc',
-            'tools/quic/quic_time_wait_list_manager.h',
           ],
         },
         {
@@ -1289,6 +1282,7 @@
             '../base/base.gyp:base',
             'net',
             'quic_tools',
+            'simple_quic_tools',
           ],
           'sources': [
             'quic/quic_server_bin.cc',