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

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/chrome_proximity_auth_client.h"
@@ skipping 61 matching lines @@
         AppWindowRegistry::Get(browser_context())
             ->GetAppWindowForAppAndKey(extension()->id(),
                                        "easy_unlock_pairing")) {
       // Mark the Easy Unlock behaviour on the lock screen as the one initiated
       // by the Easy Unlock setup app as a trial one.
       // TODO(tbarzic): Move this logic to a new easyUnlockPrivate function.
       service->SetTrialRun();
     }
     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;
 }
 
 ScreenlockPrivateAcceptAuthAttemptFunction::
     ScreenlockPrivateAcceptAuthAttemptFunction() {}
 
 ScreenlockPrivateAcceptAuthAttemptFunction::
     ~ScreenlockPrivateAcceptAuthAttemptFunction() {}
@@ skipping 26 matching lines @@
 }
 
 void ScreenlockPrivateEventRouter::OnScreenDidUnlock(
     proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type) {
   DispatchEvent(events::SCREENLOCK_PRIVATE_ON_CHANGED,
                 screenlock::OnChanged::kEventName,
                 new base::FundamentalValue(false));
 }
 
 void ScreenlockPrivateEventRouter::OnFocusedUserChanged(
-    const std::string& user_id) {
-}
+    const AccountId& account_id) {}
 
 void ScreenlockPrivateEventRouter::DispatchEvent(
     events::HistogramValue histogram_value,
     const std::string& event_name,
     base::Value* arg) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   if (arg)
     args->Append(arg);
   scoped_ptr<Event> event(new Event(histogram_value, event_name, args.Pass()));
   EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass());
@@ skipping 25 matching lines @@
   args->AppendString(value);
 
   scoped_ptr<Event> event(
       new Event(events::SCREENLOCK_PRIVATE_ON_AUTH_ATTEMPTED,
                 screenlock::OnAuthAttempted::kEventName, args.Pass()));
   router->BroadcastEvent(event.Pass());
   return true;
 }
 
 }  // namespace extensions