Move SpawnedTestServer to its own subdirectory.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 5e40c74e08486a5626a7c908eb6d55dea5b09134..de4522a192d698e017b798692a151e2c85d4eada 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2120,8 +2120,6 @@
         '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',
@@ -2132,19 +2130,21 @@
         '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',
@@ -2180,10 +2180,10 @@
         }],
         ['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"', {