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

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

BUG=42073
TEST=manual,trybotss

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71749

[tfarina, 2011-01-13 23:52:27]

I don't think it's worth updating the copyright year, but it's good though
(there aren't many files in this CL to update).

http://codereview.chromium.org/6303004/diff/1/chrome/browser/gtk/crypto_modul...
File chrome/browser/gtk/crypto_module_password_dialog.cc (right):

http://codereview.chromium.org/6303004/diff/1/chrome/browser/gtk/crypto_modul...
chrome/browser/gtk/crypto_module_password_dialog.cc:27: const std::string&
server)
wrong indentation.

http://codereview.chromium.org/6303004/diff/1/chrome/browser/gtk/crypto_modul...
chrome/browser/gtk/crypto_module_password_dialog.cc:84: bool retry,
wrong indentation.

http://codereview.chromium.org/6303004/diff/1/chrome/browser/gtk/crypto_modul...
chrome/browser/gtk/crypto_module_password_dialog.cc:211: bool retry,
wrong indentation.

[wtc, 2011-01-15 17:40:40]

LGTM!

http://codereview.chromium.org/6303004/diff/5001/base/crypto/crypto_module_bl...
File base/crypto/crypto_module_blocking_password_delegate.h (right):

http://codereview.chromium.org/6303004/diff/5001/base/crypto/crypto_module_bl...
base/crypto/crypto_module_blocking_password_delegate.h:17: class
CryptoModuleBlockingPasswordDelegate {
If this class is and will remain NSS-specific, it is fine
to use "PKCS11" instead of "CryptoModule" in its name.
I guess this class will also be used by the use_openssl
build?

http://codereview.chromium.org/6303004/diff/5001/chrome/app/generated_resourc...
File chrome/app/generated_resources.grd (right):

http://codereview.chromium.org/6303004/diff/5001/chrome/app/generated_resourc...
chrome/app/generated_resources.grd:6520: <!-- NSS PKCS11 password dialog -->
Nit: in comments, it's better to use "PKCS #11".  I won't
insist on this.

http://codereview.chromium.org/6303004/diff/5001/chrome/app/generated_resourc...
chrome/app/generated_resources.grd:6521: <message
name="IDS_CRYPTO_MODULE_AUTH_DIALOG_TITLE" desc="The title in the dialog that
prompts for security device password.">
We should standardize on one of "crypto module" and
"security device".  It would be nice for the identifier and
the message to be consistent.  You can deal with this later.

http://codereview.chromium.org/6303004/diff/5001/chrome/browser/dom_ui/option...
File chrome/browser/dom_ui/options/certificate_manager_handler.cc (right):

http://codereview.chromium.org/6303004/diff/5001/chrome/browser/dom_ui/option...
chrome/browser/dom_ui/options/certificate_manager_handler.cc:22: #include
"chrome/common/net/x509_certificate_model.h"
Just curious: why do we need to include x509_certificate_model.h?

http://codereview.chromium.org/6303004/diff/5001/chrome/chrome_browser.gypi
File chrome/chrome_browser.gypi (right):

http://codereview.chromium.org/6303004/diff/5001/chrome/chrome_browser.gypi#n...
chrome/chrome_browser.gypi:1529: 'browser/gtk/crypto_module_password_dialog.cc',
Nit: list this file in alphabetical order now that it's
renamed.  This comment also applies to some other changes
in this file.

[mattm, 2011-01-19 00:59:34]

http://codereview.chromium.org/6303004/diff/1/chrome/browser/gtk/crypto_modul...
File chrome/browser/gtk/crypto_module_password_dialog.cc (right):

http://codereview.chromium.org/6303004/diff/1/chrome/browser/gtk/crypto_modul...
chrome/browser/gtk/crypto_module_password_dialog.cc:27: const std::string&
server)
On 2011/01/13 23:52:27, tfarina wrote:
> wrong indentation. 

Done.

http://codereview.chromium.org/6303004/diff/1/chrome/browser/gtk/crypto_modul...
chrome/browser/gtk/crypto_module_password_dialog.cc:84: bool retry,
On 2011/01/13 23:52:27, tfarina wrote:
> wrong indentation. 

Done.

http://codereview.chromium.org/6303004/diff/5001/base/crypto/crypto_module_bl...
File base/crypto/crypto_module_blocking_password_delegate.h (right):

http://codereview.chromium.org/6303004/diff/5001/base/crypto/crypto_module_bl...
base/crypto/crypto_module_blocking_password_delegate.h:17: class
CryptoModuleBlockingPasswordDelegate {
On 2011/01/15 17:40:40, wtc wrote:
> If this class is and will remain NSS-specific, it is fine
> to use "PKCS11" instead of "CryptoModule" in its name.
> I guess this class will also be used by the use_openssl
> build?

Yeah, openssl will use it too

http://codereview.chromium.org/6303004/diff/5001/chrome/app/generated_resourc...
File chrome/app/generated_resources.grd (right):

http://codereview.chromium.org/6303004/diff/5001/chrome/app/generated_resourc...
chrome/app/generated_resources.grd:6520: <!-- NSS PKCS11 password dialog -->
On 2011/01/15 17:40:40, wtc wrote:
> Nit: in comments, it's better to use "PKCS #11".  I won't
> insist on this.

Done.

http://codereview.chromium.org/6303004/diff/5001/chrome/browser/dom_ui/option...
File chrome/browser/dom_ui/options/certificate_manager_handler.cc (right):

http://codereview.chromium.org/6303004/diff/5001/chrome/browser/dom_ui/option...
chrome/browser/dom_ui/options/certificate_manager_handler.cc:22: #include
"chrome/common/net/x509_certificate_model.h"
On 2011/01/15 17:40:40, wtc wrote:
> Just curious: why do we need to include x509_certificate_model.h?

It snuck in from a different change.  Removed.

http://codereview.chromium.org/6303004/diff/5001/chrome/chrome_browser.gypi
File chrome/chrome_browser.gypi (right):

http://codereview.chromium.org/6303004/diff/5001/chrome/chrome_browser.gypi#n...
chrome/chrome_browser.gypi:1529: 'browser/gtk/crypto_module_password_dialog.cc',
On 2011/01/15 17:40:40, wtc wrote:
> Nit: list this file in alphabetical order now that it's
> renamed.  This comment also applies to some other changes
> in this file.

Done.