Convert enable_bidirectional_stream into build flag local to net.

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,
+    # Enables BidirectionalStream; Used in cronet, disabled by default.
+    'enable_bidirectional_stream%': 0,
     'conditions': [
       ['chromeos==1 or embedded==1 or OS=="ios"', {
         # Disable Kerberos on ChromeOS and iOS, at least for now.
         # It needs configuration (krb5.conf and so on).
         'use_kerberos%': 0,
       }, {  # chromeos == 0 and embedded==0 and OS!="ios"
         'use_kerberos%': 1,
       }],
       ['OS=="android" and target_arch != "ia32"', {
         # The way the cache uses mmap() is inefficient on some Android devices.
@@ skipping 86 matching lines @@
     {
       # GN version: //net
       'target_name': 'net',
       'dependencies': [
         '../base/base.gyp:base_i18n',
         '../third_party/brotli/brotli.gyp:brotli',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../url/url.gyp:url_lib',
+        'net_features',
         'net_quic_proto',
       ],
       'sources': [
         'base/filename_util_icu.cc',
         'base/net_string_util_icu.cc',
         'filter/brotli_filter.cc',
       ],
       'includes': [ 'net_common.gypi' ],
     },
     {
+      # GN version: //net:features
+      'target_name': 'net_features',
+      'includes': [ '../build/buildflag_header.gypi' ],
+      'variables': {
+        'buildflag_header_path': 'net/net_features.h',
+        'buildflag_flags': [
+          'ENABLE_BIDIRECTIONAL_STREAM=<(enable_bidirectional_stream)',
+        ],
+      },
+    },
+    {
       # GN version: //net:net_unittests
       'target_name': 'net_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:base_prefs_test_support',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
         '../crypto/crypto.gyp:crypto_test_support',
@@ skipping 147 matching lines @@
             ],
             'sources!': [
               'url_request/url_request_ftp_job_unittest.cc',
             ],
           },
         ],
         [ 'enable_bidirectional_stream!=1', {
             'sources!': [
               'http/bidirectional_stream_unittest.cc',
             ],
-          }, { # else
-           'defines': [
-              'ENABLE_BIDIRECTIONAL_STREAM',
-            ],
-          }
+          },
         ],
         [ 'enable_built_in_dns!=1', {
             'sources!': [
               'dns/address_sorter_posix_unittest.cc',
               'dns/address_sorter_unittest.cc',
             ],
           },
         ],
         [ 'use_v8_in_net==1', {
             'dependencies': [
@@ skipping 1045 matching lines @@
         { # The same target as 'net', but with smaller binary size due to
           # exclusion of ICU, FTP, FILE and WebSockets support.
           'target_name': 'net_small',
           'variables': {
             'disable_ftp_support': 1,
             'disable_file_support': 1,
             'enable_websockets': 0,
           },
           'dependencies': [
             '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
+            'net_features',
           ],
           'defines': [
             'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
             'DISABLE_FILE_SUPPORT=1',
             'DISABLE_FTP_SUPPORT=1',
           ],
           'sources': [
             'filter/brotli_filter_disabled.cc',
             'base/net_string_util_icu_alternatives_android.cc',
             'base/net_string_util_icu_alternatives_android.h',
@@ skipping 336 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }