Clean up uses of use_glib that are not related to glib dependencies

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,
     'use_tracing_cache_backend%': 0,
@@ skipping 1299 matching lines @@
               'ssl/openssl_client_key_store.cc',
               'ssl/openssl_client_key_store.h',
             ],
           },
         ],
         [ 'use_glib == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gconf',
               '../build/linux/system.gyp:gio',
             ],
+        }],
+        [ 'desktop_linux == 1 or chromeos == 1', {
             'conditions': [
               ['use_openssl==1', {
                 'dependencies': [
                   '../third_party/openssl/openssl.gyp:openssl',
                 ],
               },
               {  # else use_openssl==0, use NSS
                 'dependencies': [
                   '../build/linux/system.gyp:ssl',
                 ],
@@ skipping 661 matching lines @@
             # No res_ninit() et al on Android, so this doesn't make a lot of
             # sense.
             'dns/dns_config_service_posix_unittest.cc',
             'ssl/client_cert_store_impl_unittest.cc',
           ],
           'dependencies': [
             'net_javatests',
             'net_test_jni_headers',
           ],
         }],
-        [ 'use_glib == 1', {
+        [ 'desktop_linux == 1 or chromeos == 1', {
             'dependencies': [
               '../build/linux/system.gyp:ssl',
             ],
-          }, {  # else use_glib == 0: !posix || mac
+          }, {  # desktop_linux == 0 and chromeos == 0
             'sources!': [
               'cert/nss_cert_database_unittest.cc',
             ],
           },
         ],
         [ 'toolkit_uses_gtk == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
             ],
           },
@@ skipping 12 matching lines @@
             'USE_KERBEROS',
           ],
         }, { # use_kerberos == 0
           'sources!': [
             'http/http_auth_gssapi_posix_unittest.cc',
             'http/http_auth_handler_negotiate_unittest.cc',
             'http/mock_gssapi_library_posix.cc',
             'http/mock_gssapi_library_posix.h',
           ],
         }],
-        [ 'use_openssl == 1 or (use_glib == 0 and OS != "ios")', {
+        [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != "ios")', {
           # Only include this test when on Posix and using NSS for
           # cert verification or on iOS (which also uses NSS for certs).
           'sources!': [
             'ocsp/nss_ocsp_unittest.cc',
           ],
         }],
         [ 'use_openssl==1', {
             # When building for OpenSSL, we need to exclude NSS specific tests.
             # TODO(bulach): Add equivalent tests when the underlying
             #               functionality is ported to OpenSSL.
@@ skipping 980 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }