Extract ScopedTestNSSDB from nss_util.

crypto/crypto.gyp

 # Copyright (c) 2012 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,
   },
   'includes': [
     'crypto.gypi',
@@ skipping 93 matching lines @@
             ],
             # TODO(joth): Use a glob to match exclude patterns once the
             #             OpenSSL file set is complete.
             'sources!': [
               'ec_private_key_nss.cc',
               'ec_signature_creator_nss.cc',
               'encryptor_nss.cc',
               'hmac_nss.cc',
               'nss_util.cc',
               'nss_util.h',
+              'nss_util_internal.h',
               'rsa_private_key_nss.cc',
               'secure_hash_default.cc',
               'signature_creator_nss.cc',
               'signature_verifier_nss.cc',
               'symmetric_key_nss.cc',
               'third_party/nss/chromium-blapi.h',
               'third_party/nss/chromium-blapit.h',
               'third_party/nss/chromium-nss.h',
               'third_party/nss/chromium-prtypes.h',
               'third_party/nss/chromium-sha256.h',
@@ skipping 18 matching lines @@
               'signature_verifier_openssl.cc',
               'symmetric_key_openssl.cc',
             ],
         },],
       ],
       'sources': [
         '<@(crypto_sources)',
       ],
     },
     {
+      'target_name': 'crypto_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'crypto',
+      ],
+      'sources': [
+        'scoped_test_nss_db.cc',
+        'scoped_test_nss_db.h',
+        'scoped_test_nss_chromeos_user.cc',
+        'scoped_test_nss_chromeos_user.h',
+        'scoped_test_system_nss_key_slot.cc',
+        'scoped_test_system_nss_key_slot.h',
+      ],
+      'conditions': [

[Ryan Sleevi, 2014/07/23 02:15:28]

I don't think this will compile on Windows/Mac/OpenSSL.

You probably need to wrap the target in a conditional, where it's a 'none'
target on !use_nss && !chromeos, and a static_library case (like you've got
setup here).

[pneubeck (no reviews), 2014/07/23 14:34:16]

Done.

+        ['use_nss==0', {
+          'sources!': [
+            'scoped_test_nss_db.cc',
+            'scoped_test_nss_db.h',
+          ],
+        }],
+        [ 'chromeos==0', {
+          'sources!': [
+            'scoped_test_nss_chromeos_user.cc',
+            'scoped_test_nss_chromeos_user.h',
+            'scoped_test_system_nss_key_slot.cc',
+            'scoped_test_system_nss_key_slot.h',
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'crypto_unittests',
       'type': 'executable',
       'sources': [
         'curve25519_unittest.cc',
         'ec_private_key_unittest.cc',
         'ec_signature_creator_unittest.cc',
         'encryptor_unittest.cc',
         'ghash_unittest.cc',
         'hkdf_unittest.cc',
         'hmac_unittest.cc',
         'nss_util_unittest.cc',
         'openssl_bio_string_unittest.cc',
         'p224_unittest.cc',
         'p224_spake_unittest.cc',
         'random_unittest.cc',
         'rsa_private_key_unittest.cc',
         'rsa_private_key_nss_unittest.cc',
         'secure_hash_unittest.cc',
         'sha2_unittest.cc',
         'signature_creator_unittest.cc',
         'signature_verifier_unittest.cc',
         'symmetric_key_unittest.cc',
       ],
       'dependencies': [
         'crypto',
+        'crypto_test_support',
         '../base/base.gyp:base',
         '../base/base.gyp:run_all_unittests',
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             [ 'use_allocator!="none"', {
@@ skipping 62 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }