Update from https://crrev.com/311076

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 952 matching lines @@
       'quic/quic_unacked_packet_map.h',
       'quic/quic_utils.cc',
       'quic/quic_utils.h',
       'quic/quic_utils_chromium.h',
       'quic/quic_write_blocked_list.cc',
       'quic/quic_write_blocked_list.h',
       'quic/reliable_quic_stream.cc',
       'quic/reliable_quic_stream.h',
       'quic/spdy_utils.cc',
       'quic/spdy_utils.h',
+      'sdch/sdch_owner.cc',
+      'sdch/sdch_owner.h',
       'socket/client_socket_factory.cc',
       'socket/client_socket_factory.h',
       'socket/client_socket_pool.cc',
       'socket/client_socket_pool.h',
       'socket/client_socket_pool_base.cc',
       'socket/client_socket_pool_base.h',
       'socket/client_socket_pool_manager.cc',
       'socket/client_socket_pool_manager.h',
       'socket/client_socket_pool_manager_impl.cc',
       'socket/client_socket_pool_manager_impl.h',
@@ skipping 425 matching lines @@
       'http/http_chunked_decoder_unittest.cc',
       'http/http_content_disposition_unittest.cc',
       'http/http_log_util_unittest.cc',
       'http/http_network_layer_unittest.cc',
       'http/http_network_transaction_ssl_unittest.cc',
       'http/http_network_transaction_unittest.cc',
       'http/http_proxy_client_socket_pool_unittest.cc',
       'http/http_request_headers_unittest.cc',
       'http/http_response_body_drainer_unittest.cc',
       'http/http_response_headers_unittest.cc',
+      'http/http_response_info_unittest.cc',
       'http/http_security_headers_unittest.cc',
       'http/http_server_properties_impl_unittest.cc',
       'http/http_server_properties_manager_unittest.cc',
       'http/http_status_code_unittest.cc',
       'http/http_stream_factory_impl_request_unittest.cc',
       'http/http_stream_factory_impl_unittest.cc',
       'http/http_stream_parser_unittest.cc',
       'http/http_util_unittest.cc',
       'http/http_vary_data_unittest.cc',
       'http/mock_allow_url_security_manager.cc',
@@ skipping 149 matching lines @@
       'quic/quic_socket_address_coder_test.cc',
       'quic/quic_stream_factory_test.cc',
       'quic/quic_stream_sequencer_test.cc',
       'quic/quic_sustained_bandwidth_recorder_test.cc',
       'quic/quic_time_test.cc',
       'quic/quic_unacked_packet_map_test.cc',
       'quic/quic_utils_chromium_test.cc',
       'quic/quic_utils_test.cc',
       'quic/quic_write_blocked_list_test.cc',
       'quic/reliable_quic_stream_test.cc',
+      'sdch/sdch_owner_unittest.cc',
       'server/http_connection_unittest.cc',
       'server/http_server_response_info_unittest.cc',
       'server/http_server_unittest.cc',
       'server/web_socket_encoder_unittest.cc',
       'socket/client_socket_pool_base_unittest.cc',
       'socket/deterministic_socket_data_unittest.cc',
       'socket/mock_client_socket_pool_manager.cc',
       'socket/mock_client_socket_pool_manager.h',
       'socket/socks5_client_socket_unittest.cc',
       'socket/socks_client_socket_pool_unittest.cc',
@@ skipping 125 matching lines @@
       'websockets/websocket_handshake_stream_create_helper_test.cc',
       'websockets/websocket_inflater_test.cc',
       'websockets/websocket_stream_test.cc',
       'websockets/websocket_test_util.cc',
       'websockets/websocket_test_util.h',
     ],
     'net_linux_test_sources': [
       'quic/quic_end_to_end_unittest.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_clock_test.cc',
       'tools/quic/quic_epoll_connection_helper_test.cc',
       'tools/quic/quic_in_memory_cache_test.cc',
       'tools/quic/quic_server_session_test.cc',
       'tools/quic/quic_server_test.cc',
       'tools/quic/quic_spdy_client_stream_test.cc',
       'tools/quic/quic_spdy_server_stream_test.cc',
       'tools/quic/quic_time_wait_list_manager_test.cc',
       'tools/quic/test_tools/http_message.cc',
@@ skipping 23 matching lines @@
     ],
     'net_base_mac_ios_sources': [
       'base/mac/url_conversions.h',
       'base/mac/url_conversions.mm',
     ],
     'net_base_test_mac_ios_sources': [
       'base/mac/url_conversions_unittest.mm',
     ],
   }
 }