Easy Sign-in: Use TPM RSA key to sign nonce in sign-in protocol

chrome/browser/signin/easy_unlock_service_regular.cc

Index: chrome/browser/signin/easy_unlock_service_regular.cc
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc
index 355130916364ec7471df9a6713aa2a80e656d7c4..9fc9d719577a6e6892c2aba342da8e4119e70ad2 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -27,6 +27,8 @@
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"
+#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
+#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"

[xiyuan, 2014/12/02 23:15:58]

nit: Seems not used.

[tbarzic, 2014/12/03 19:10:28]

Done.

 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user_manager.h"
@@ -186,15 +188,12 @@ void EasyUnlockServiceRegular::SetRemoteDevices(
       !devices.empty()) {
     // We may already have the password cached, so proceed to create the
     // cryptohome keys for sign-in or the system will be hardlocked.
-    chromeos::UserContext* user_context =
-        short_lived_user_context_->user_context();
-    chromeos::EasyUnlockKeyManager* key_manager =
-        chromeos::UserSessionManager::GetInstance()->GetEasyUnlockKeyManager();
-
-    key_manager->RefreshKeys(
-        *user_context, devices,
-        base::Bind(&EasyUnlockServiceRegular::OnKeysRefreshedForSetDevices,
-                   weak_ptr_factory_.GetWeakPtr()));
+    chromeos::UserSessionManager::GetInstance()->GetEasyUnlockKeyManager()
+        ->RefreshKeys(
+            *short_lived_user_context_->user_context(),
+            devices,
+            base::Bind(&EasyUnlockServiceRegular::OnKeysRefreshedForSetDevices,
+                       weak_ptr_factory_.GetWeakPtr()));
   } else {
     CheckCryptohomeKeysAndMaybeHardlock();
   }