Update from https://crrev.com/308331

net/net.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 647 matching lines @@
           },
         ],
         [ 'use_openssl_certs == 0', {
             'sources!': [
               'ssl/openssl_client_key_store_unittest.cc',
             ],
         }],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^websockets/'],
+              ['exclude', '^server/'],
+            ],
+            'dependencies!': [
+              'http_server',
             ],
         }],
         ['disable_file_support==1', {
           'sources!': [
             'base/directory_lister_unittest.cc',
             'url_request/url_request_file_job_unittest.cc',
           ],
         }],
         [ 'disable_ftp_support==1', {
             'sources/': [
@@ skipping 274 matching lines @@
         'test/spawned_test_server/local_test_server_win.cc',
         'test/spawned_test_server/local_test_server.cc',
         'test/spawned_test_server/local_test_server.h',
         'test/spawned_test_server/remote_test_server.cc',
         'test/spawned_test_server/remote_test_server.h',
         'test/spawned_test_server/spawned_test_server.h',
         'test/spawned_test_server/spawner_communicator.cc',
         'test/spawned_test_server/spawner_communicator.h',
         'test/url_request/url_request_failed_job.cc',
         'test/url_request/url_request_failed_job.h',
+        'test/url_request/url_request_mock_data_job.cc',
+        'test/url_request/url_request_mock_data_job.h',
         'test/url_request/url_request_mock_http_job.cc',
         'test/url_request/url_request_mock_http_job.h',
         'url_request/test_url_fetcher_factory.cc',
         'url_request/test_url_fetcher_factory.h',
         'url_request/test_url_request_interceptor.cc',
         'url_request/test_url_request_interceptor.h',
         'url_request/url_request_test_util.cc',
         'url_request/url_request_test_util.h',
       ],
       'conditions': [
@@ skipping 96 matching lines @@
         'server/http_connection.cc',
         'server/http_connection.h',
         'server/http_server.cc',
         'server/http_server.h',
         'server/http_server_request_info.cc',
         'server/http_server_request_info.h',
         'server/http_server_response_info.cc',
         'server/http_server_response_info.h',
         'server/web_socket.cc',
         'server/web_socket.h',
+        'server/web_socket_encoder.cc',
+        'server/web_socket_encoder.h',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
     {
       'target_name': 'balsa',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         'net',
@@ skipping 650 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }