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

net/net.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 764 matching lines @@
     {
       # This is a temporary target which will be merged into 'net' once the
       # dependency on balsa is eliminated and the classes are actually used.
       'target_name': 'quic_tools',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../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',
       ],
     },
     {
       'target_name': 'simple_quic_tools',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../url/url.gyp:url_lib',
         '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',
       ],
     },
   ],
   'conditions': [
     ['use_v8_in_net == 1', {
       'targets': [
         {
           'target_name': 'net_with_v8',
@@ skipping 407 matching lines @@
             'tools/quic/quic_client.cc',
             'tools/quic/quic_client.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',
             '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',
             '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_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',
           ],
         },
         {
           'target_name': 'quic_client',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
             'quic_base',
             'simple_quic_tools',
           ],
           'sources': [
             'tools/quic/quic_client_bin.cc',
           ],
         },
       ]
     }],
     ['os_posix == 1 and OS != "ios" and OS != "android"', {
       'targets': [
         {
           'target_name': 'quic_server',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
             'quic_tools',
+            'simple_quic_tools',
           ],
           'sources': [
             'quic/quic_server_bin.cc',
           ],
         },
       ]
     }],
     ['OS=="android"', {
       'targets': [
         { # The same target as 'net', but with smaller binary size due to
@@ skipping 215 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }