Small cleanups to ported QuicServer and dependencies

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,
     'use_tracing_cache_backend%': 0,
@@ skipping 528 matching lines @@
         '../crypto/crypto.gyp:crypto',
         '../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_test_support',
-        'quic_ported_server',
       ],
       'sources': [
         '<@(net_test_sources)',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'dependencies': [
             'epoll_server',
             'flip_in_mem_edsm_server_base',
             'quic_base',
@@ skipping 548 matching lines @@
         'tools/dump_cache/upgrade_win.cc',
         'tools/dump_cache/upgrade_win.h',
         'tools/dump_cache/url_to_filename_encoder.cc',
         'tools/dump_cache/url_to_filename_encoder.h',
         'tools/dump_cache/url_utilities.h',
         'tools/dump_cache/url_utilities.cc',
       ],
       # 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_ported_server',
-      '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': [
-        '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',
-      ],
-    },
   ],
   'conditions': [
     ['use_v8_in_net == 1', {
       'targets': [
         {
           'target_name': 'net_with_v8',
           'type': '<(component)',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
@@ skipping 341 matching lines @@
           'sources': [
             'tools/quic/quic_client_bin.cc',
           ],
         },
         {
           'target_name': 'quic_server',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
-            'quic_ported_server',
           ],
           'sources': [
             'quic/quic_server_bin.cc',
           ],
         },
       ]
     }],
     ['OS=="android"', {
       'targets': [
         {
@@ skipping 179 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }