Unify the QUIC client classes.

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 1125 matching lines @@
       ":flip_in_mem_edsm_server_base",
       ":net",
       "//base",
     ]
   }
 
   source_set("quic_base") {
     sources = [
       "tools/quic/quic_client.cc",
       "tools/quic/quic_client.h",
-      "tools/quic/quic_client_session.cc",
-      "tools/quic/quic_client_session.h",
       "tools/quic/quic_default_packet_writer.cc",
       "tools/quic/quic_default_packet_writer.h",
       "tools/quic/quic_dispatcher.cc",
       "tools/quic/quic_dispatcher.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_in_memory_cache.cc",
       "tools/quic/quic_in_memory_cache.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_per_connection_packet_writer.cc",
       "tools/quic/quic_per_connection_packet_writer.h",
       "tools/quic/quic_server.cc",
       "tools/quic/quic_server.h",
       "tools/quic/quic_server_session.cc",
       "tools/quic/quic_server_session.h",
       "tools/quic/quic_socket_utils.cc",
       "tools/quic/quic_socket_utils.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",
     ]
     deps = [
       ":balsa",
       ":epoll_server",
       ":net",
       "//base",
@@ skipping 78 matching lines @@
   ]
   deps = [
     ":net",
     "//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_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",
+    "tools/quic/quic_spdy_client_stream.cc",
+    "tools/quic/quic_spdy_client_stream.h",
     "tools/quic/synchronous_host_resolver.cc",
     "tools/quic/synchronous_host_resolver.h",
   ]
   deps = [
     ":net",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//url",
   ]
 }
@@ skipping 356 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" ]
   }
 }