Implemented profile-aware owner key loading.

chrome/browser/chromeos/settings/owner_key_util.h

Index: chrome/browser/chromeos/settings/owner_key_util.h
diff --git a/chrome/browser/chromeos/settings/owner_key_util.h b/chrome/browser/chromeos/settings/owner_key_util.h
index 8e42a50da0ef8dc78e4932ab447f8f41110a020e..268d439e7e2b0ab179462ade16d030434c89c548 100644
--- a/chrome/browser/chromeos/settings/owner_key_util.h
+++ b/chrome/browser/chromeos/settings/owner_key_util.h
@@ -13,6 +13,7 @@
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
+#include "net/cert/x509_util_nss.h"
 
 namespace base {
 class FilePath;
@@ -41,6 +42,13 @@ class OwnerKeyUtil : public base::RefCountedThreadSafe<OwnerKeyUtil> {
   virtual crypto::RSAPrivateKey* FindPrivateKey(

[Mattias Nissler (ping if slow), 2014/05/12 08:26:43]

I guess this is now deprecated and should be removed? If so, please add a bug +
TODO.

[ygorshenin1, 2014/05/13 09:46:13]

Done.

       const std::vector<uint8>& key) = 0;
 
+  // Looks for the private key associated with |key| in the |slot|
+  // and returns it if it can be found.  Returns NULL otherwise.
+  // Caller takes ownership.
+  virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
+      const std::vector<uint8>& key,
+      PK11SlotInfo* slot) = 0;
+
   // Checks whether the public key is present in the file system.
   virtual bool IsPublicKeyPresent() = 0;
 
@@ -63,6 +71,9 @@ class OwnerKeyUtilImpl : public OwnerKeyUtil {
   virtual bool ImportPublicKey(std::vector<uint8>* output) OVERRIDE;
   virtual crypto::RSAPrivateKey* FindPrivateKey(
       const std::vector<uint8>& key) OVERRIDE;
+  virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
+      const std::vector<uint8>& key,
+      PK11SlotInfo* slot) OVERRIDE;
   virtual bool IsPublicKeyPresent() OVERRIDE;
 
  protected: