Move simple QUIC client classes around in the .gyp files.

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 1246 matching lines @@
     "quic/quic_time_wait_list_manager.cc",
     "quic/quic_time_wait_list_manager.h",
   ]
   deps = [
     ":net",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//url",
   ]
 }
-
-executable("simple_quic_client") {
-  testonly = true
+source_set("simple_quic_tools") {
   sources = [
     "tools/quic/quic_simple_client.cc",
     "tools/quic/quic_simple_client.h",
-    "tools/quic/quic_simple_client_bin.cc",
     "tools/quic/quic_simple_client_session.cc",
     "tools/quic/quic_simple_client_session.h",
     "tools/quic/quic_simple_client_stream.cc",
     "tools/quic/quic_simple_client_stream.h",
   ]
   deps = [
     ":net",
     "//base",
+    "//base/third_party/dynamic_annotations",
+    "//url",
+  ]
+}
+
+executable("simple_quic_client") {
+  testonly = true
+  sources = [
+    "tools/quic/quic_simple_client_bin.cc",
+  ]
+  deps = [
+    ":net",
+    ":simple_quic_tools",
+    "//base",
     "//url",
   ]
 }
 
 # 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
@@ skipping 335 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" ]
   }
 }