Move remaining QUIC server files from net/quic/ to 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 96 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
         '../url/url.gyp:url_lib',
         'balsa',
         'http_server',
         'net',
         'net_derived_sources',
         'net_extras',
         'net_test_support',
-        'quic_tools',
         'simple_quic_tools',
       ],
       'sources': [
         '<@(net_test_sources)',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'dependencies': [
+            'epoll_quic_tools',
             'epoll_server',
             'flip_in_mem_edsm_server_base',
-            'quic_base',
           ],
           'sources': [
             '<@(net_linux_test_sources)',
           ],
         }],
         ['OS == "mac" or OS == "ios"', {
           'sources': [
             '<@(net_base_test_mac_ios_sources)',
           ],
         }],
@@ skipping 627 matching lines @@
         'tools/dump_cache/simple_cache_dumper.h',
         'tools/dump_cache/url_to_filename_encoder.cc',
         'tools/dump_cache/url_to_filename_encoder.h',
         'tools/dump_cache/url_utilities.cc',
         'tools/dump_cache/url_utilities.h',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
     {
-      # 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_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',
-      ],
-    },
-    {
       '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_client_session.cc',
         'tools/quic/quic_client_session.h',
         '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',
         'tools/quic/quic_simple_client.h',
+        'tools/quic/quic_simple_per_connection_packet_writer.cc',
+        'tools/quic/quic_simple_per_connection_packet_writer.h',
+        'tools/quic/quic_simple_server.cc',
+        'tools/quic/quic_simple_server.h',
+        'tools/quic/quic_simple_server_packet_writer.cc',
+        'tools/quic/quic_simple_server_packet_writer.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',
       ],
     },
@@ skipping 252 matching lines @@
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
             'net_test_support',
           ],
           'sources': [
             'tools/testserver/run_testserver.cc',
           ],
         },
         {
-          'target_name': 'simple_quic_client',
+          'target_name': 'quic_client',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../url/url.gyp:url_lib',
             'net',
             'simple_quic_tools',
           ],
           'sources': [
             'tools/quic/quic_simple_client_bin.cc',
           ],
         },
         {
+          'target_name': 'quic_server',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'net',
+            'simple_quic_tools',
+          ],
+          'sources': [
+            'tools/quic/quic_simple_server_bin.cc',
+          ],
+        },
+        {
           'target_name': 'stress_cache',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
             'net_test_support',
           ],
           'sources': [
             'tools/stress_cache/stress_cache.cc',
           ],
@@ skipping 107 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             'flip_in_mem_edsm_server_base',
             'net',
           ],
           'sources': [
             'tools/flip_server/flip_in_mem_edsm_server.cc',
           ],
         },
         {
-          'target_name': 'quic_base',
+          'target_name': 'epoll_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',
             'balsa',
             'epoll_server',
             'net',
           ],
           'sources': [
             '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_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_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_server.cc',
             'tools/quic/quic_server.h',
             'tools/quic/quic_socket_utils.cc',
             'tools/quic/quic_socket_utils.h',
           ],
         },
         {
-          'target_name': 'quic_client',
+          'target_name': 'epoll_quic_client',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
-            'quic_base',
+            'epoll_quic_tools',
             'simple_quic_tools',
           ],
           'sources': [
             'tools/quic/quic_client_bin.cc',
           ],
         },
-      ]
-    }],
-    ['os_posix == 1 and OS != "ios" and OS != "android"', {
-      'targets': [
         {
-          'target_name': 'quic_server',
+          'target_name': 'epoll_quic_server',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
-            'quic_tools',
+            'epoll_quic_tools',
             'simple_quic_tools',
           ],
           'sources': [
-            'quic/quic_server_bin.cc',
+            'tools/quic/quic_server_bin.cc',
           ],
         },
       ]
     }],
     ['OS=="android"', {
       'targets': [
         { # The same target as 'net', but with smaller binary size due to
           # exclusion of ICU, FTP, FILE and WebSockets support.
           'target_name': 'net_small',
           'variables': {
@@ skipping 212 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }