Move remaining QUIC server files from net/quic/ to net/tools/quic/.

net/BUILD.gn

 # Copyright (c) 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//url/config.gni")
 import("//testing/test.gni")
@@ skipping 1121 matching lines @@
       "tools/flip_server/flip_in_mem_edsm_server.cc",
     ]
     deps = [
       ":balsa",
       ":flip_in_mem_edsm_server_base",
       ":net",
       "//base",
     ]
   }
 
-  source_set("quic_base") {
+  source_set("epoll_quic_tools") {
     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",
     ]
     deps = [
       ":balsa",
       ":epoll_server",
       ":net",
       "//base",
       "//base/third_party/dynamic_annotations",
       "//crypto",
       "//third_party/boringssl",
       "//url",
     ]
   }
-
-  executable("quic_client") {
-    sources = [
-      "tools/quic/quic_client_bin.cc",
-    ]
-    deps = [
-      ":balsa",
-      ":epoll_server",
-      ":quic_base",
-      ":net",
-      ":simple_quic_tools",
-      "//base",
-      "//third_party/boringssl",
-    ]
-  }
 }
 
 if (is_android) {
   generate_jni("net_jni_headers") {
     sources = [
       "android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
       "android/java/src/org/chromium/net/AndroidKeyStore.java",
       "android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
       "android/java/src/org/chromium/net/AndroidPrivateKey.java",
       "android/java/src/org/chromium/net/GURLUtils.java",
@@ skipping 17 matching lines @@
     sources = [
       "tools/disk_cache_memory_test/disk_cache_memory_test.cc",
     ]
     deps = [
       ":net",
       "//base",
     ]
   }
 }
 
-# This source_set is defined even if no build targets need it,
-# such as when all dependees are not buildable for the chosen OS.
-source_set("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",
-  ]
-  deps = [
-    ":net",
-    ":simple_quic_tools",
-    "//base",
-    "//base/third_party/dynamic_annotations",
-    "//url",
-  ]
-}
 source_set("simple_quic_tools") {
   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",
   ]
   deps = [
     ":net",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//url",
   ]
 }
 
-executable("simple_quic_client") {
-  testonly = true
+executable("quic_client") {
   sources = [
     "tools/quic/quic_simple_client_bin.cc",
   ]
   deps = [
     ":net",
     ":simple_quic_tools",
     "//base",
     "//url",
   ]
 }
 
+executable("epoll_quic_client") {
+  sources = [
+    "tools/quic/quic_client_bin.cc",
+  ]
+  deps = [
+    ":balsa",
+    ":epoll_server",
+    ":epoll_quic_tools",
+    ":net",
+    ":simple_quic_tools",
+    "//base",
+    "//third_party/boringssl",
+  ]
+}
+
+executable("epoll_quic_server") {
+  sources = [
+    "tools/quic/quic_server_bin.cc",
+  ]
+  deps = [
+    ":balsa",
+    ":epoll_server",
+    ":epoll_quic_tools",
+    ":net",
+    ":simple_quic_tools",
+    "//base",
+    "//third_party/boringssl",
+  ]
+}
+
+executable("quic_server") {
+  sources = [
+    "tools/quic/quic_simple_server_bin.cc",
+  ]
+  deps = [
+    ":net",
+    ":simple_quic_tools",
+    "//base",
+    "//third_party/boringssl",
+  ]
+}
+
 # TODO(GYP) make this compile on Android, we need some native test deps done.
 # TODO(GYP) Also doesn't work on Windows; dependency on boringssl is wrong.
 # TODO(GYP) Also doesn't work on Mac, need to figure out why not.
 if (!is_android && !is_win && !is_mac) {
   test("net_unittests") {
     sources = gypi_values.net_test_sources
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     defines = []
 
     deps = [
       ":extras",
       ":http_server",
       ":net",
-      ":quic_tools",
+      ":epoll_quic_tools",
       ":simple_quic_tools",
       ":test_support",
       "//base",
       "//base:i18n",
       "//base:prefs_test_support",
       "//base/allocator",
       "//base/third_party/dynamic_annotations",
       "//crypto",
       "//crypto:platform",
       "//crypto:test_support",
       "//gin",
       "//net/base/registry_controlled_domains",
       "//sql",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/zlib",
       "//url",
     ]
 
     if (is_linux) {
       sources += gypi_values.net_linux_test_sources
       deps += [
         ":balsa",
         ":epoll_server",
         ":flip_in_mem_edsm_server_base",
-        ":quic_base",
+        ":epoll_quic_tools",
       ]
     }
 
     if (is_mac || is_ios) {
       sources += gypi_values.net_base_test_mac_ios_sources
     }
 
     if (is_chromeos) {
       sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
     }
@@ skipping 239 matching lines @@
     if (use_icu_alternatives_on_android) {
       sources -= [
         "base/filename_util_unittest.cc",
         "base/net_util_icu_unittest.cc",
       ]
       deps -= [ "//base:i18n" ]
     }
   }
 }  # !is_android && !is_win && !is_mac
 
-if (!is_android && !is_win) {
-  executable("quic_server") {
-    sources = [
-      "quic/quic_server_bin.cc",
-    ]
-    deps = [
-      ":net",
-      ":quic_tools",
-      ":simple_quic_tools",
-      "//base",
-      "//third_party/boringssl",
-    ]
-  }
-}
-
 executable("net_perftests") {
   testonly = true
   sources = [
     "cookies/cookie_monster_perftest.cc",
     "disk_cache/blockfile/disk_cache_perftest.cc",
     "proxy/proxy_resolver_perftest.cc",
     "udp/udp_socket_perftest.cc",
   ]
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
@@ skipping 17 matching lines @@
   } else {
     sources -= [ "proxy/proxy_resolver_perftest.cc" ]
   }
 
   if (is_win && icu_use_data_file) {
     # This is needed to trigger the dll copy step on windows.
     # TODO(mark): Specifying this here shouldn't be necessary.
     deps += [ "//third_party/icu:icudata" ]
   }
 }