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

chrome/browser/signin/easy_unlock_service_regular.h

Index: chrome/browser/signin/easy_unlock_service_regular.h
diff --git a/chrome/browser/signin/easy_unlock_service_regular.h b/chrome/browser/signin/easy_unlock_service_regular.h
index 2a4579777b69e26bbe0baf982fdaab5cb5dd4a52..6169a2a4efc7e13278eb8479235d5433c22852fc 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.h
+++ b/chrome/browser/signin/easy_unlock_service_regular.h
@@ -77,7 +77,7 @@ class EasyUnlockServiceRegular
 
   // EasyUnlockService implementation:
   EasyUnlockService::Type GetType() const override;
-  std::string GetUserEmail() const override;
+  const AccountId GetAccountId() const override;

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

AccountId?

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

Done.

   void LaunchSetup() override;
   const base::DictionaryValue* GetPermitAccess() const override;
   void SetPermitAccess(const base::DictionaryValue& permit) override;
@@ -90,9 +90,9 @@ class EasyUnlockServiceRegular
   TurnOffFlowStatus GetTurnOffFlowStatus() const override;
   std::string GetChallenge() const override;
   std::string GetWrappedSecret() const override;
-  void RecordEasySignInOutcome(const std::string& user_id,
+  void RecordEasySignInOutcome(const AccountId& account_id,
                                bool success) const override;
-  void RecordPasswordLoginEvent(const std::string& user_id) const override;
+  void RecordPasswordLoginEvent(const AccountId& account_id) const override;
   void StartAutoPairing(const AutoPairingResultCallback& callback) override;
   void SetAutoPairingResult(bool success, const std::string& error) override;
   void InitializeInternal() override;
@@ -116,8 +116,7 @@ class EasyUnlockServiceRegular
   void OnScreenDidUnlock(
       proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type)
       override;
-  void OnFocusedUserChanged(const std::string& user_id) override;
-
+  void OnFocusedUserChanged(const AccountId& account_id) override;
 
   // Callback when the controlling pref changes.
   void OnPrefsChanged();