Look for Owner key in both private and public slots

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.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/ownership/owner_settings_service_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 47 matching lines @@
 }
 
 void LoadPrivateKeyByPublicKey(
     const scoped_refptr<OwnerKeyUtil>& owner_key_util,
     scoped_refptr<PublicKey> public_key,
     const std::string& username_hash,
     const base::Callback<void(const scoped_refptr<PublicKey>& public_key,
                               const scoped_refptr<PrivateKey>& private_key)>&
         callback) {
   crypto::EnsureNSSInit();
-  crypto::ScopedPK11Slot slot =
+  crypto::ScopedPK11Slot public_slot =
       crypto::GetPublicSlotForChromeOSUser(username_hash);
-  scoped_refptr<PrivateKey> private_key(new PrivateKey(
-      owner_key_util->FindPrivateKeyInSlot(public_key->data(), slot.get())));
+  crypto::ScopedPK11Slot private_slot = crypto::GetPrivateSlotForChromeOSUser(
+      username_hash, base::Callback<void(crypto::ScopedPK11Slot)>());
+
+  // If private slot is already available, this will check it. If not,
+  // we'll get called again later when the TPM Token is ready, and the
+  // slot will be available then.
+  scoped_refptr<PrivateKey> private_key(
+      new PrivateKey(owner_key_util->FindPrivateKeyInSlot(public_key->data(),
+                                                          private_slot.get())));
+  if (!private_key->key()) {
+    private_key = new PrivateKey(owner_key_util->FindPrivateKeyInSlot(
+        public_key->data(), public_slot.get()));
+  }
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(callback, public_key, private_key));
 }
 
 void LoadPrivateKey(
     const scoped_refptr<OwnerKeyUtil>& owner_key_util,
     const std::string username_hash,
     const base::Callback<void(const scoped_refptr<PublicKey>& public_key,
                               const scoped_refptr<PrivateKey>& private_key)>&
@@ skipping 235 matching lines @@
   service->OnSignAndStoreOperationCompleted(status);
   if (!callback.is_null())
     callback.Run();
 
   pending_operations_.pop_front();
   delete operation;
   StartNextOperation();
 }
 
 }  // namespace chromeos