Move SpawnedTestServer to its own subdirectory.

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 2102 matching lines @@
         'dns/mock_host_resolver.cc',
         'dns/mock_host_resolver.h',
         'proxy/mock_proxy_resolver.cc',
         'proxy/mock_proxy_resolver.h',
         'proxy/mock_proxy_script_fetcher.cc',
         'proxy/mock_proxy_script_fetcher.h',
         'proxy/proxy_config_service_common_unittest.cc',
         'proxy/proxy_config_service_common_unittest.h',
         'socket/socket_test_util.cc',
         'socket/socket_test_util.h',
-        'test/base_test_server.cc',
-        'test/base_test_server.h',
         'test/cert_test_util.cc',
         'test/cert_test_util.h',
         'test/embedded_test_server/http_connection.cc',
         'test/embedded_test_server/http_connection.h',
         'test/embedded_test_server/http_request.cc',
         'test/embedded_test_server/http_request.h',
         'test/embedded_test_server/http_response.cc',
         'test/embedded_test_server/http_response.h',
         'test/embedded_test_server/http_server.cc',
         'test/embedded_test_server/http_server.h',
-        'test/local_test_server_posix.cc',
-        'test/local_test_server_win.cc',
-        'test/local_test_server.cc',
-        'test/local_test_server.h',
         'test/net_test_suite.cc',
         'test/net_test_suite.h',
         'test/python_utils.cc',
         'test/python_utils.h',
-        'test/remote_test_server.cc',
-        'test/remote_test_server.h',
-        'test/spawned_test_server.h',
-        'test/spawner_communicator.cc',
-        'test/spawner_communicator.h',
+        'test/spawned_test_server/base_test_server.cc',
+        'test/spawned_test_server/base_test_server.h',
+        'test/spawned_test_server/local_test_server_posix.cc',
+        'test/spawned_test_server/local_test_server_win.cc',
+        'test/spawned_test_server/local_test_server.cc',
+        'test/spawned_test_server/local_test_server.h',
+        'test/spawned_test_server/remote_test_server.cc',
+        'test/spawned_test_server/remote_test_server.h',
+        'test/spawned_test_server/spawned_test_server.h',
+        'test/spawned_test_server/spawner_communicator.cc',
+        'test/spawned_test_server/spawner_communicator.h',
         'url_request/test_url_fetcher_factory.cc',
         'url_request/test_url_fetcher_factory.h',
         'url_request/url_request_test_util.cc',
         'url_request/url_request_test_util.h',
       ],
       'conditions': [
         ['inside_chromium_build==1 and OS != "ios"', {
           'dependencies': [
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
@@ skipping 15 matching lines @@
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['OS != "android"', {
           'sources!': [
-            'test/remote_test_server.cc',
-            'test/remote_test_server.h',
-            'test/spawner_communicator.cc',
-            'test/spawner_communicator.h',
+            'test/spawned_test_server/remote_test_server.cc',
+            'test/spawned_test_server/remote_test_server.h',
+            'test/spawned_test_server/spawner_communicator.cc',
+            'test/spawned_test_server/spawner_communicator.h',
           ],
         }],
         ['OS == "ios"', {
           'dependencies': [
             '../third_party/nss/nss.gyp:nss',
           ],
         }],
         [ 'use_v8_in_net==1', {
             'dependencies': [
               'net_with_v8',
@@ skipping 655 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }