Update from https://crrev.com/308331

net/BUILD.gn

 # Copyright (c) 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//url/config.gni")
 
 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni.
@@ skipping 548 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",
   ]
   configs += [
     "//build/config/compiler:wexit_time_destructors",
     ":net_win_size_truncation",
   ]
   deps = [
     ":net",
     "//base",
   ]
 }
@@ skipping 91 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",
   ]
 
@@ skipping 550 matching lines @@
       # cert verification or on iOS (which also uses NSS for certs).
       sources -= [ "ocsp/nss_ocsp_unittest.cc" ]
     }
 
     if (!use_openssl_certs) {
       sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
     }
 
     if (!enable_websockets) {
       sources -= [
+        "server/http_connection_unittest.cc",
+        "server/http_server_response_info_unittest.cc",
+        "server/http_server_unittest.cc",
+        "server/web_socket_encoder_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_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",
       ]
+      deps -= [ ":http_server" ]
     }
 
     if (disable_file_support) {
       sources -= [
         "base/directory_lister_unittest.cc",
         "url_request/url_request_file_job_unittest.cc",
       ]
     }
 
     if (disable_ftp_support) {
@@ skipping 120 matching lines @@
       "quic/quic_server_bin.cc",
     ]
     deps = [
       ":quic_tools",
       ":net",
       "//base",
       "//third_party/boringssl",
     ]
   }
 }  # !is_android && !is_win && !is_mac