Fix Smart Lock bugs introduced by change from raw email to AccountId.

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 1d0af809565d1c34b4d61f191ae599008257cc89..85e60da0e7ae295830bde127af93ad8fd2b44fa2 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -163,11 +163,13 @@ AccountId EasyUnlockServiceRegular::GetAccountId() const {
   // |profile| has to be a signed-in profile with SigninManager already
   // created. Otherwise, just crash to collect stack.
   DCHECK(signin_manager);
-  const std::string user_email =
-      signin_manager->GetAuthenticatedAccountInfo().email;
-  return user_email.empty()
+  const AccountInfo account_info =
+      signin_manager->GetAuthenticatedAccountInfo();
+  return account_info.email.empty()
              ? EmptyAccountId()
-             : AccountId::FromUserEmail(gaia::CanonicalizeEmail(user_email));
+             : AccountId::FromUserEmailGaiaId(
+                   gaia::CanonicalizeEmail(account_info.email),
+                   account_info.gaia);
 }
 
 void EasyUnlockServiceRegular::LaunchSetup() {