This CL replaces e-mail with AccountId in easy signin code.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h
index 206d2635f32593c5334bfcc5b0f6fc04e02d2256..afd35b6f906c9a0cac814e07c4f38644e83ceff2 100644
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h
@@ -10,6 +10,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "components/signin/core/account_id/account_id.h"
 
 class EasyUnlockTpmKeyManager;
 
@@ -24,12 +25,12 @@ class EasyUnlockChallengeWrapper {
   // |challenge|: The raw challenge to wrap.
   // |channel_binding_data|: Data unique to the current secure channel such that
   //                         we can bind with a TPM signature.
-  // |user_id|: The id of the user who owns both devices.
+  // |account_id|: The id of the user who owns both devices.
   // |key_manager|: Responsible for signing some piece of data with the TPM.
   //                Not owned and should outlive this instance.
   EasyUnlockChallengeWrapper(const std::string& challenge,
                              const std::string& channel_binding_data,
-                             const std::string& user_id,
+                             const AccountId& account_id,
                              EasyUnlockTpmKeyManager* key_manager);
   virtual ~EasyUnlockChallengeWrapper();
 
@@ -59,7 +60,7 @@ class EasyUnlockChallengeWrapper {
   const std::string channel_binding_data_;
 
   // The id of the user who owns both devices.
-  const std::string user_id_;
+  const AccountId account_id_;

[achuithb, 2015/12/04 10:12:52]

Should this be a const pointer or is a copy correct?

[Alexander Alekseev, 2015/12/04 12:44:06]

It is created as a copy of a temporary object. So it would be tricky to make
this a reference.

 
   // Responsible for signing data with the TPM. Not owned.
   EasyUnlockTpmKeyManager* key_manager_;