Sync various changes to QuicTestClient.

net/net.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 2158 matching lines @@
             'tools/quic/test_tools/quic_in_memory_cache_peer.h',
             'tools/quic/test_tools/quic_in_memory_cache_peer.cc',
             'tools/quic/test_tools/quic_server_peer.cc',
             'tools/quic/test_tools/quic_server_peer.h',
             'tools/quic/test_tools/quic_test_client.cc',
             'tools/quic/test_tools/quic_test_client.h',
             'tools/quic/test_tools/quic_test_utils.cc',
             'tools/quic/test_tools/quic_test_utils.h',
             'tools/quic/test_tools/server_thread.h',
             'tools/quic/test_tools/server_thread.cc',
+            'tools/quic/test_tools/simple_client.h',
+            'tools/quic/test_tools/simple_client.cc',
           ],
         }],
         ['chromeos==1', {
           'sources!': [
             'base/network_change_notifier_linux_unittest.cc',
             'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
         [ 'OS == "android"', {
           'sources!': [
@@ skipping 1191 matching lines @@
             'java_in_dir': 'cronet/android/sample/javatests',
             'resource_dir': 'cronet/android/sample/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ],
 }