Landing Recent QUIC changes until Sun Sep 4 03:41:00

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,
     'conditions': [
       ['chromeos==1 or embedded==1 or OS=="ios"', {
@@ skipping 822 matching lines @@
         '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_process_packet_interface.h',
         'tools/quic/quic_simple_client.cc',
         'tools/quic/quic_simple_client.h',
+        'tools/quic/quic_simple_crypto_server_stream_helper.cc',
+        'tools/quic/quic_simple_crypto_server_stream_helper.h',
         'tools/quic/quic_simple_dispatcher.cc',
         'tools/quic/quic_simple_dispatcher.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_simple_server_session.cc',
         'tools/quic/quic_simple_server_session.h',
@@ skipping 844 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }