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

net/net.gypi

 # Copyright 2014 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.
 
 # This file is shared between the regular GYP build, the NaCl GYP build, and
 # the GN build. For GN support, it must have no conditionals or anything like
 # that beyond the simple one-level-deep dictionary of values.
 {
   'variables': {
     # Subset of net source files that are compiled for NaCl (net_nacl target).
@@ skipping 1781 matching lines @@
       'url_request/url_request_simple_job_unittest.cc',
       'url_request/url_request_throttler_simulation_unittest.cc',
       'url_request/url_request_throttler_test_support.cc',
       'url_request/url_request_throttler_test_support.h',
       'url_request/url_request_throttler_unittest.cc',
       'url_request/url_request_unittest.cc',
       'url_request/view_cache_helper_unittest.cc',
     ],
     'net_linux_test_sources': [
       'quic/quic_end_to_end_unittest.cc',
+      'tools/quic/chlo_extractor_test.cc',
       'tools/quic/end_to_end_test.cc',
       'tools/quic/quic_client_session_test.cc',
       'tools/quic/quic_client_test.cc',
       'tools/quic/quic_dispatcher_test.cc',
       'tools/quic/quic_epoll_alarm_factory_test.cc',
       'tools/quic/quic_epoll_clock_test.cc',
       'tools/quic/quic_epoll_connection_helper_test.cc',
       'tools/quic/quic_in_memory_cache_test.cc',
       'tools/quic/quic_server_session_base_test.cc',
       'tools/quic/quic_server_test.cc',
@@ skipping 1266 matching lines @@
       'third_party/nist-pkits/crls/requireExplicitPolicy5subCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7CACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subCARE2CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl',
     ],
   }
 }