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

chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

 // Copyright 2014 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/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 80 matching lines @@
     LOG(ERROR) << "Unable to get Easy unlock key data.";
     Notify(false);
     return;
   }
 
   EasyUnlockService* service =
       EasyUnlockService::Get(ProfileHelper::GetSigninProfile());
   service->AddObserver(this);
 
   static_cast<EasyUnlockServiceSignin*>(service)
-      ->SetCurrentUser(user_context_.GetAccountId().GetUserEmail());
+      ->SetCurrentUser(user_context_.GetAccountId());
   OnScreenlockStateChanged(service->GetScreenlockState());
 }
 
 void BootstrapUserContextInitializer::OnEasyUnlockAuthenticated(
     EasyUnlockAuthAttempt::Type auth_attempt_type,
     bool success,
-    const std::string& user_id,
+    const AccountId& account_id,
     const std::string& key_secret,
     const std::string& key_label) {
   DCHECK_EQ(EasyUnlockAuthAttempt::TYPE_SIGNIN, auth_attempt_type);
   if (!success || key_secret.empty()) {
     LOG(ERROR) << "Failed to sign-in using existing Smart lock key.";
     Notify(false);
     return;
   }
 
   user_context_.SetKey(Key(key_secret));
@@ skipping 76 matching lines @@
   // TODO(xiyuan): Add timeout and hook up with error UI after
   //     http://crbug.com/471067.
   if (state != proximity_auth::ScreenlockState::AUTHENTICATED)
     return;
 
   EasyUnlockService* service =
       EasyUnlockService::Get(ProfileHelper::GetSigninProfile());
   service->RemoveObserver(this);
 
   service->AttemptAuth(
-      user_context_.GetAccountId().GetUserEmail(),
+      user_context_.GetAccountId(),
       base::Bind(&BootstrapUserContextInitializer::OnEasyUnlockAuthenticated,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 }  // namespace chromeos