Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

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 801 matching lines @@
       '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',
         'net_quic_proto',
       ],
       'sources': [
+        'tools/quic/chlo_extractor.cc',
+        'tools/quic/chlo_extractor.h',
         'tools/quic/quic_client_base.cc',
         'tools/quic/quic_client_base.h',
         'tools/quic/quic_client_session.cc',
         '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',
@@ skipping 895 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }