openssl build fixes, and tidy the build files

build/linux/system.gyp

 # Copyright (c) 2009 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.
 
 {
   'conditions': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
@@ skipping 313 matching lines @@
         ],
       },
     },
     {
       'target_name': 'openssl',
       'type': 'settings',
       'conditions': [
         ['use_openssl==1', {
           'direct_dependent_settings': {
             'defines': [
-              # OpenSSL support is in development.
-              # eventually USE_OPENSSL and USE_NSS will be mutually exclusive.
-              # During the transitional period, a use_openssl=1 build still
-              # needs to define USE_NSS, so it is necessary to test the
-              # USE_OPENSSL macro before testing USE_NSS.
+              # OpenSSL support is incomplete: http://crbug.com/62803.
+              # Defining USE_OPENSSL disables USE_NSS.
               'USE_OPENSSL',
             ],
             'include_dirs': [
               '<!@(<(pkg-config) --cflags openssl)',
             ],
           },
           'link_settings': {
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l openssl)',
             ],
           },
         },],
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: