Update from https://crrev.com/304121

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 363 matching lines @@
       # These were already removed on non-ChromeOS.
       sources -= [
         "ssl/client_cert_store_chromeos.cc",
         "ssl/client_cert_store_chromeos.h",
       ]
     }
   }
 
   if (!enable_websockets) {
     sources -= [
-      "socket_stream/socket_stream.cc",
-      "socket_stream/socket_stream.h",
-      "socket_stream/socket_stream_job.cc",
-      "socket_stream/socket_stream_job.h",
-      "socket_stream/socket_stream_job_manager.cc",
-      "socket_stream/socket_stream_job_manager.h",
-      "socket_stream/socket_stream_metrics.cc",
-      "socket_stream/socket_stream_metrics.h",
-      "spdy/spdy_websocket_stream.cc",
-      "spdy/spdy_websocket_stream.h",
       "websockets/websocket_basic_handshake_stream.cc",
       "websockets/websocket_basic_handshake_stream.h",
       "websockets/websocket_basic_stream.cc",
       "websockets/websocket_basic_stream.h",
       "websockets/websocket_channel.cc",
       "websockets/websocket_channel.h",
       "websockets/websocket_deflate_predictor.h",
       "websockets/websocket_deflate_predictor_impl.cc",
       "websockets/websocket_deflate_predictor_impl.h",
       "websockets/websocket_deflate_stream.cc",
@@ skipping 16 matching lines @@
       "websockets/websocket_handshake_handler.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_job.cc",
-      "websockets/websocket_job.h",
       "websockets/websocket_mux.h",
-      "websockets/websocket_net_log_params.cc",
-      "websockets/websocket_net_log_params.h",
       "websockets/websocket_stream.cc",
       "websockets/websocket_stream.h",
-      "websockets/websocket_throttle.cc",
-      "websockets/websocket_throttle.h",
     ]
   }
 
   if (!enable_mdns) {
     sources -= [
       "dns/mdns_cache.cc",
       "dns/mdns_cache.h",
       "dns/mdns_client.cc",
       "dns/mdns_client.h",
       "dns/mdns_client_impl.cc",
@@ skipping 132 matching lines @@
     "server/http_server_response_info.cc",
     "server/http_server_response_info.h",
     "server/web_socket.cc",
     "server/web_socket.h",
   ]
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
   deps = [
     ":net",
     "//base",
   ]
-  if (is_win) {
-    cflags = [
-      "/wd4267",
-    ]
-  }
 }
 
 executable("dump_cache") {
   testonly = true
   sources = [
     "tools/dump_cache/cache_dumper.cc",
     "tools/dump_cache/cache_dumper.h",
     "tools/dump_cache/dump_cache.cc",
     "tools/dump_cache/dump_files.cc",
     "tools/dump_cache/dump_files.h",
@@ skipping 76 matching lines @@
     "test/spawned_test_server/base_test_server.h",
     "test/spawned_test_server/local_test_server_posix.cc",
     "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_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",
   ]
 
   configs += [ ":net_win_size_truncation" ]
 
@@ skipping 377 matching lines @@
     sources = [ "tools/disk_cache_memory_test/disk_cache_memory_test.cc" ]
     deps = [
       ":net",
       "//base",
     ]
   }
 }
 
 # TODO(GYP) make this compile on Android, we need some native test deps done.
 # TODO(GYP) Also doesn't work on Windows; dependency on boringssl is wrong.
-if (!is_android && !is_win) {
+# TODO(GYP) Also doesn't work on Mac, need to figure out why not.
+if (!is_android && !is_win && !is_mac) {
 
 source_set("quic_tools") {
   sources = [
     "quic/quic_dispatcher.cc",
     "quic/quic_dispatcher.h",
     "quic/quic_in_memory_cache.cc",
     "quic/quic_in_memory_cache.h",
     "quic/quic_per_connection_packet_writer.cc",
     "quic/quic_per_connection_packet_writer.h",
     "quic/quic_server.cc",
@@ skipping 131 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 -= [
-      "socket_stream/socket_stream_metrics_unittest.cc",
-      "socket_stream/socket_stream_unittest.cc",
-      "spdy/spdy_websocket_stream_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_spdy_test.cc",
       "websockets/websocket_handshake_handler_test.cc",
       "websockets/websocket_handshake_stream_create_helper_test.cc",
       "websockets/websocket_inflater_test.cc",
-      "websockets/websocket_job_test.cc",
-      "websockets/websocket_net_log_params_test.cc",
       "websockets/websocket_stream_test.cc",
       "websockets/websocket_test_util.cc",
       "websockets/websocket_test_util.h",
-      "websockets/websocket_throttle_test.cc",
     ]
   }
 
   if (disable_file_support) {
     sources -= [
       "base/directory_lister_unittest.cc",
       "url_request/url_request_file_job_unittest.cc",
     ]
   }
 
@@ skipping 117 matching lines @@
 executable("quic_server") {
   sources = [ "quic/quic_server_bin.cc" ]
   deps = [
     ":quic_tools",
     ":net",
     "//base",
     "//third_party/boringssl",
   ]
 }
 
-}  # !is_android
+}  # !is_android && !is_win && !is_mac