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

Review URL: https://codereview.chromium.org/1021153003

Cr-Commit-Position: refs/heads/master@{#321636}

net/BUILD.gn

@@ -1264,13 +1264,10 @@ source_set("quic_tools") {
     "//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",
@@ -1279,6 +1276,20 @@ executable("simple_quic_client") {
   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",
   ]
 }

net/net.gyp

@@ -801,6 +801,24 @@
         'quic/quic_time_wait_list_manager.h',
       ],
     },
+    {
+      'target_name': 'simple_quic_tools',
+      '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': [
+        'tools/quic/quic_simple_client.cc',
+        'tools/quic/quic_simple_client.h',
+        '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',
+      ],
+    },
   ],
   'conditions': [
     ['use_v8_in_net == 1', {
@@ -1069,15 +1087,10 @@
             '../base/base.gyp:base',
             '../url/url.gyp:url_lib',
             'net',
+            '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',
           ],
         },
         {