Landing Recent QUIC changes until 4/15/2016 17:20 UTC

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 329 matching lines @@
       'quic/quic_config.cc',
       'quic/quic_config.h',
       'quic/quic_connection.cc',
       'quic/quic_connection.h',
       'quic/quic_connection_logger.cc',
       'quic/quic_connection_logger.h',
       'quic/quic_connection_stats.cc',
       'quic/quic_connection_stats.h',
       'quic/quic_crypto_stream.cc',
       'quic/quic_crypto_stream.h',
+      'quic/quic_chromium_alarm_factory.cc',
+      'quic/quic_chromium_alarm_factory.h',
       'quic/quic_chromium_connection_helper.cc',
       'quic/quic_chromium_connection_helper.h',
       'quic/quic_chromium_packet_reader.cc',
       'quic/quic_chromium_packet_reader.h',
       'quic/quic_chromium_packet_writer.cc',
       'quic/quic_chromium_packet_writer.h',
       'quic/quic_data_reader.cc',
       'quic/quic_data_reader.h',
       'quic/quic_data_writer.cc',
       'quic/quic_data_writer.h',
@@ skipping 1224 matching lines @@
       'quic/interval_set_test.cc',
       'quic/interval_test.cc',
       'quic/iovector_test.cc',
       'quic/network_connection_unittest.cc',
       'quic/p2p/quic_p2p_session_test.cc',
       'quic/port_suggester_unittest.cc',
       'quic/quic_address_mismatch_test.cc',
       'quic/quic_alarm_test.cc',
       'quic/quic_arena_scoped_ptr_test.cc',
       'quic/quic_bandwidth_test.cc',
+      'quic/quic_chromium_alarm_factory_test.cc',
       'quic/quic_chromium_client_session_test.cc',
       'quic/quic_chromium_client_stream_test.cc',
       'quic/quic_chromium_connection_helper_test.cc',
       'quic/quic_client_push_promise_index_test.cc',
       'quic/quic_clock_test.cc',
       'quic/quic_config_test.cc',
       'quic/quic_connection_logger_unittest.cc',
       'quic/quic_connection_test.cc',
       'quic/quic_crypto_client_stream_test.cc',
       'quic/quic_crypto_server_stream_test.cc',
@@ skipping 372 matching lines @@
       "websockets/websocket_handshake_stream_create_helper.cc",
       "websockets/websocket_handshake_stream_create_helper.h",
       "websockets/websocket_inflater.cc",
       "websockets/websocket_inflater.h",
       "websockets/websocket_mux.h",
       "websockets/websocket_stream.cc",
       "websockets/websocket_stream.h",
     ],
   }
 }