Update from https://crrev.com/305340

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 1218 matching lines @@
       'websockets/websocket_extension.cc',
       'websockets/websocket_extension.h',
       'websockets/websocket_extension_parser.cc',
       'websockets/websocket_extension_parser.h',
       'websockets/websocket_frame.cc',
       'websockets/websocket_frame.h',
       'websockets/websocket_frame_parser.cc',
       'websockets/websocket_frame_parser.h',
       'websockets/websocket_handshake_constants.cc',
       'websockets/websocket_handshake_constants.h',
-      'websockets/websocket_handshake_handler.cc',
-      'websockets/websocket_handshake_handler.h',
+      'websockets/websocket_handshake_challenge.cc',
+      'websockets/websocket_handshake_challenge.h',
       'websockets/websocket_handshake_request_info.cc',
       'websockets/websocket_handshake_request_info.h',
       'websockets/websocket_handshake_response_info.cc',
       'websockets/websocket_handshake_response_info.h',
       'websockets/websocket_handshake_stream_base.h',
       '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',
@@ skipping 451 matching lines @@
       'url_request/view_cache_helper_unittest.cc',
       'websockets/websocket_basic_stream_test.cc',
       'websockets/websocket_channel_test.cc',
       'websockets/websocket_deflate_predictor_impl_test.cc',
       'websockets/websocket_deflate_stream_test.cc',
       'websockets/websocket_deflater_test.cc',
       'websockets/websocket_errors_test.cc',
       'websockets/websocket_extension_parser_test.cc',
       'websockets/websocket_frame_parser_test.cc',
       'websockets/websocket_frame_test.cc',
-      'websockets/websocket_handshake_handler_test.cc',
+      'websockets/websocket_handshake_challenge_test.cc',
       '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',
@@ skipping 26 matching lines @@
       'tools/quic/test_tools/quic_test_client.h',
       'tools/quic/test_tools/quic_test_utils.cc',
       'tools/quic/test_tools/quic_test_utils.h',
       'tools/quic/test_tools/server_thread.h',
       'tools/quic/test_tools/server_thread.cc',
       'tools/quic/test_tools/simple_client.h',
       'tools/quic/test_tools/simple_client.cc',
     ],
   }
 }