Introduce an 'ENABLE_WEBSOCKETS' define in //net.

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/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 50 matching lines @@
   defines = []
   if (posix_avoid_mmap) {
     defines += [ "POSIX_AVOID_MMAP" ]
   }
   if (disable_file_support) {
     defines += [ "DISABLE_FILE_SUPPORT" ]
   }
   if (disable_ftp_support) {
     defines += [ "DISABLE_FTP_SUPPORT=1" ]
   }
+  if (enable_websockets) {
+    defines += [ "ENABLE_WEBSOCKETS" ]

[mmenke, 2016/06/20 15:14:09]

Hrm...We should probably go with DISABLE_WEBSOCKETS instead.  The other features
use default on, don't see why this should be different.  Admittedly, mixing that
with the enable_websockets gyp/gn define is a little confusing.  Probably worth
changing that as well at some point - feel free to do that now, in this CL, but
also feel free not to.

Doesn't look like it's used outside net, so should be a pretty simple change.

[Mike West, 2016/06/21 10:31:15]

It doesn't look that clearcut. We have
"DISABLE_FILE_SUPPORT"/"DISABLE_FTP_SUPPORT"/"disable_brotli_filter" one the one
hand, but
"ENABLE_WEBSOCKETS"/"ENABLE_BUILT_IN_DNS"/"USE_KERBEROS"/"use_v8_in_net" on the
other.
If aligning on one or the other would help clarify things for the build, great.
I think that can be done in a separate CL, however.

WDYT?


 

[mmenke, 2016/06/21 16:33:54]

SGTM.

+  }
 }
 
 config("net_internal_config") {
   defines = [
     "DLOPEN_KERBEROS",
     "NET_IMPLEMENTATION",
   ]
 
   if (use_kerberos) {
     defines += [ "USE_KERBEROS" ]
@@ skipping 1989 matching lines @@
     "url_request/url_request_fuzzer.cc",
   ]
   deps = [
     ":net_fuzzer_test_support",
     ":test_support",
     "//base",
     "//net",
   ]
   dict = "data/http/http.dict"
 }