Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate.

base/base.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 540 matching lines @@
               'hmac_openssl.cc',
               'openssl_util.cc',
               'openssl_util.h',
               'sha2_openssl.cc',
             ],
         },],
       ],
       'sources': [
         'crypto/capi_util.cc',
         'crypto/capi_util.h',
+        'crypto/crypto_module_blocking_password_delegate.h',
         'crypto/cssm_init.cc',
         'crypto/cssm_init.h',
         'crypto/encryptor.h',
         'crypto/encryptor_mac.cc',
         'crypto/encryptor_nss.cc',
         'crypto/encryptor_openssl.cc',
         'crypto/encryptor_win.cc',
-        'crypto/pk11_blocking_password_delegate.h',
         'crypto/rsa_private_key.h',
         'crypto/rsa_private_key.cc',
         'crypto/rsa_private_key_mac.cc',
         'crypto/rsa_private_key_nss.cc',
         'crypto/rsa_private_key_openssl.cc',
         'crypto/rsa_private_key_win.cc',
         'crypto/signature_creator.h',
         'crypto/signature_creator_mac.cc',
         'crypto/signature_creator_nss.cc',
         'crypto/signature_creator_openssl.cc',
@@ skipping 150 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }