Update keygen to use correct NSS slot on ChromeOS multiprofile.

chrome/browser/ui/crypto_module_password_dialog_nss.cc

 // 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.
 
-#include "chrome/browser/ui/crypto_module_password_dialog.h"
+#include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
 
 #include <pk11pub.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/crypto_module.h"
 #include "net/cert/x509_certificate.h"
 
 using content::BrowserThread;
@@ skipping 13 matching lines @@
  public:
   SlotUnlocker(const net::CryptoModuleList& modules,
                chrome::CryptoModulePasswordReason reason,
                const std::string& host,
                gfx::NativeWindow parent,
                const base::Closure& callback);
 
   void Start();
 
  private:
-  void GotPassword(const char* password);
+  void GotPassword(const std::string& password);
   void Done();
 
   size_t current_;
   net::CryptoModuleList modules_;
   chrome::CryptoModulePasswordReason reason_;
   std::string host_;
   gfx::NativeWindow parent_;
   base::Closure callback_;
   PRBool retry_;
 };
@@ skipping 24 matching lines @@
           reason_,
           host_,
           parent_,
           base::Bind(&SlotUnlocker::GotPassword, base::Unretained(this)));
       return;
     }
   }
   Done();
 }
 
-void SlotUnlocker::GotPassword(const char* password) {
+void SlotUnlocker::GotPassword(const std::string& password) {
   // TODO(mattm): PK11_DoPassword has something about PK11_Global.verifyPass.
   // Do we need it?
   // http://mxr.mozilla.org/mozilla/source/security/nss/lib/pk11wrap/pk11auth.c#577
 
-  if (!password) {
+  if (password.empty()) {
     // User cancelled entering password.  Oh well.
     ++current_;
     Start();
     return;
   }
 
   // TODO(mattm): handle protectedAuthPath
   SECStatus rv = PK11_CheckUserPassword(modules_[current_]->os_module_handle(),
-                                        password);
+                                        password.c_str());
   if (rv == SECWouldBlock) {
     // Incorrect password.  Try again.
     retry_ = PR_TRUE;
     Start();
     return;
   }
 
   // TODO(mattm): PK11_DoPassword calls nssTrustDomain_UpdateCachedTokenCerts on
   // non-friendly slots.  How important is that?
 
@@ skipping 33 matching lines @@
                                const std::string& host,
                                gfx::NativeWindow parent,
                                const base::Closure& callback) {
   net::CryptoModuleList modules;
   modules.push_back(net::CryptoModule::CreateFromHandle(
       cert->os_cert_handle()->slot));
   UnlockSlotsIfNecessary(modules, reason, host, parent, callback);
 }
 
 }  // namespace chrome