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

chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc

Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
index f93b1ef613988ad55c5b0d263d0613e172cdba75..875d8ad41a51f57ae1c0e0289f4758f7a09148cb 100644
--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
@@ -79,8 +79,8 @@ bool ScreenlockPrivateSetLockedFunction::RunAsync() {
     }
     proximity_auth::ScreenlockBridge::Get()->Lock();
   } else {
-    proximity_auth::ScreenlockBridge::Get()->Unlock(
-        service->proximity_auth_client()->GetAuthenticatedUsername());
+    proximity_auth::ScreenlockBridge::Get()->Unlock(AccountId::FromUserEmail(
+        service->proximity_auth_client()->GetAuthenticatedUsername()));
   }
   SendResponse(error_.empty());
   return true;
@@ -127,8 +127,7 @@ void ScreenlockPrivateEventRouter::OnScreenDidUnlock(
 }
 
 void ScreenlockPrivateEventRouter::OnFocusedUserChanged(
-    const std::string& user_id) {
-}
+    const AccountId& /* account_id */) {}

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

personally I don't think the /* */ is necessary since the fn body is empty

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

Done.

 
 void ScreenlockPrivateEventRouter::DispatchEvent(
     events::HistogramValue histogram_value,