Update keygen to use correct NSS slot on ChromeOS multiprofile.

chrome/browser/ui/crypto_module_password_dialog_nss.h

Index: chrome/browser/ui/crypto_module_password_dialog_nss.h
diff --git a/chrome/browser/ui/crypto_module_password_dialog_openssl.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.h
similarity index 33%
rename from chrome/browser/ui/crypto_module_password_dialog_openssl.cc
rename to chrome/browser/ui/crypto_module_password_dialog_nss.h
index 3d0e34cb6db241a6d2e99e7c23be6713d64f12e9..374f0da047419792f955676b37b872bbbdbc6991 100644
--- a/chrome/browser/ui/crypto_module_password_dialog_openssl.cc
+++ b/chrome/browser/ui/crypto_module_password_dialog_nss.h
@@ -1,29 +1,44 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
+#ifndef CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_
+#define CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_
+
+#include <string>
+#include <vector>
+
+#include "base/callback_forward.h"
+#include "base/memory/ref_counted.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
+#include "ui/gfx/native_widget_types.h"
 
-#include "base/logging.h"
+namespace net {
+class CryptoModule;
+typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
+class X509Certificate;
+}
 
 namespace chrome {
 
+// Asynchronously unlock |modules|, if necessary.  |callback| is called when
+// done (regardless if any modules were successfully unlocked or not).  Should
+// only be called on UI thread.

[Ryan Sleevi, 2013/12/05 00:23:19]

comment nit: Single spaces follow periods, not double. Same with 33-35.

[mattm, 2013/12/05 04:41:25]

Done.

 void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules,
                             CryptoModulePasswordReason reason,
-                            const std::string& host,
+                            const std::string& server,

[Ryan Sleevi, 2013/12/05 00:23:19]

I didn't follow your comment. Are you saying different callers call
UnlockSlotsIfNecessary, sometimes with a hostname and sometimes with a
host_and_port?

If so, rather than renaming this variable, the callers should be made to be
consistent. I'd lean on "hostname" as the preferred form.

[mattm, 2013/12/05 04:41:25]

yeah, basically. (I don't recall if it was through UnlockSlotsIfNecessary in
different ways, or some go UnlockSlotsIfNecessary is one way and the password
delegate users went a different way.  But ShowCryptoModulePasswordDialog ends up
getting called in different ways.)
I'd like to do that all in a separate CL if it's ok with you.

                             gfx::NativeWindow parent,
-                            const base::Closure& callback) {
-  // TODO(bulach): implement me.
-  NOTREACHED();
-}
+                            const base::Closure& callback);
 
+// Asynchronously unlock the |cert|'s module, if necessary.  |callback| is
+// called when done (regardless if module was successfully unlocked or not).
+// Should only be called on UI thread.
 void UnlockCertSlotIfNecessary(net::X509Certificate* cert,
                                CryptoModulePasswordReason reason,
-                               const std::string& host,
+                               const std::string& server,
                                gfx::NativeWindow parent,
-                               const base::Closure& callback) {
-  // TODO(bulach): implement me.
-  NOTREACHED();
-}
+                               const base::Closure& callback);
 
 }  // namespace chrome
+
+#endif  // CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_