Update from https://crrev.com/308331

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 135 matching lines @@
       'ssl/openssl_client_key_store.h',
       'ssl/openssl_platform_key.h',
       'ssl/openssl_platform_key_mac.cc',
       'ssl/openssl_platform_key_win.cc',
       'ssl/openssl_ssl_util.cc',
       'ssl/openssl_ssl_util.h',
       'ssl/signed_certificate_timestamp_and_status.cc',
       'ssl/signed_certificate_timestamp_and_status.h',
       'ssl/ssl_cert_request_info.cc',
       'ssl/ssl_cert_request_info.h',
+      'ssl/ssl_cipher_suite_names.cc',
+      'ssl/ssl_cipher_suite_names.h',
       'ssl/ssl_client_auth_cache.cc',
       'ssl/ssl_client_auth_cache.h',
       'ssl/ssl_client_cert_type.h',
       'ssl/ssl_config.cc',
       'ssl/ssl_config.h',
       'ssl/ssl_config_service.cc',
       'ssl/ssl_config_service.h',
       'ssl/ssl_info.cc',
       'ssl/ssl_info.h',
     ],
@@ skipping 934 matching lines @@
       'spdy/write_blocked_list.h',
       'ssl/client_cert_store.h',
       'ssl/client_cert_store_chromeos.cc',
       'ssl/client_cert_store_chromeos.h',
       'ssl/client_cert_store_mac.cc',
       'ssl/client_cert_store_mac.h',
       'ssl/client_cert_store_nss.cc',
       'ssl/client_cert_store_nss.h',
       'ssl/client_cert_store_win.cc',
       'ssl/client_cert_store_win.h',
-      'ssl/ssl_cipher_suite_names.cc',
-      'ssl/ssl_cipher_suite_names.h',
       'ssl/ssl_config_service_defaults.cc',
       'ssl/ssl_config_service_defaults.h',
       'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
       'third_party/mozilla_security_manager/nsKeygenHandler.h',
       'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
       'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
       'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
       'third_party/mozilla_security_manager/nsPKCS12Blob.h',
       'udp/datagram_client_socket.h',
       'udp/datagram_server_socket.h',
@@ skipping 458 matching lines @@
       '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',
       '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',
       'socket/socks_client_socket_unittest.cc',
       'socket/ssl_client_socket_openssl_unittest.cc',
       'socket/ssl_client_socket_pool_unittest.cc',
       'socket/ssl_client_socket_unittest.cc',
@@ skipping 164 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',
     ],
   }
 }