Use FindNSSKeyFromPublicKeyInfoInSlot in GetPrivateKeyOnWorkerThread.

chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

 // Copyright 2014 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/chromeos/platform_keys/platform_keys.h"
 
 #include <cert.h>
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <secder.h>
@@ skipping 433 matching lines @@
       true /*task is slow*/);
 }
 
 // Does the actual signing on a worker thread. Used by SignRSAWithDB().
 void SignRSAOnWorkerThread(scoped_ptr<SignRSAState> state) {
   const uint8* public_key_uint8 =
       reinterpret_cast<const uint8*>(state->public_key_.data());
   std::vector<uint8> public_key_vector(
       public_key_uint8, public_key_uint8 + state->public_key_.size());
 
-  // TODO(pneubeck): This searches all slots. Change to look only at |slot_|.
-  crypto::ScopedSECKEYPrivateKey rsa_key(
-      crypto::FindNSSKeyFromPublicKeyInfo(public_key_vector));
+  crypto::ScopedSECKEYPrivateKey rsa_key;
+  if (state->slot_) {
+    rsa_key = crypto::FindNSSKeyFromPublicKeyInfoInSlot(public_key_vector,
+                                                        state->slot_.get());
+  } else {
+    rsa_key = crypto::FindNSSKeyFromPublicKeyInfo(public_key_vector);
+  }
 
-  // Fail if the key was not found. If a specific slot was requested, also fail
-  // if the key was found in the wrong slot.
-  if (!rsa_key || SECKEY_GetPrivateKeyType(rsa_key.get()) != rsaKey ||
-      (state->slot_ && rsa_key->pkcs11Slot != state->slot_)) {
+  // Fail if the key was not found or is of the wrong type.
+  if (!rsa_key || SECKEY_GetPrivateKeyType(rsa_key.get()) != rsaKey) {
     state->OnError(FROM_HERE, kErrorKeyNotFound);
     return;
   }
 
   std::string signature_str;
   if (state->sign_direct_pkcs_padded_) {
     static_assert(
         sizeof(*state->data_.data()) == sizeof(char),
         "Can't reinterpret data if it's characters are not 8 bit large.");
     SECItem input = {siBuffer,
@@ skipping 414 matching lines @@
   NSSOperationState* state_ptr = state.get();
   GetCertDatabase(std::string() /* don't get any specific slot */,
                   base::Bind(&GetTokensWithDB, base::Passed(&state)),
                   browser_context,
                   state_ptr);
 }
 
 }  // namespace platform_keys
 
 }  // namespace chromeos