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

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
@@ skipping 386 matching lines @@
   captive_portal_status_ = state.status;
   if (offline_login_is_active() ||
       IsOnline(captive_portal_status_) == IsOnline(previous_status) ||
       disable_restrictive_proxy_check_for_test_ ||
       GetCurrentScreen() != OobeUI::SCREEN_GAIA_SIGNIN)
     return;
 
   LoadAuthExtension(true /* force */, false /* offline */);
 }
 
-void GaiaScreenHandler::HandleIdentifierEntered(
-    const std::string& account_identifier) {
-  if (!Delegate()->IsUserWhitelisted(account_identifier))
+void GaiaScreenHandler::HandleIdentifierEntered(const std::string& user_email) {
+  if (!Delegate()->IsUserWhitelisted(
+          user_manager::UserManager::Get()->GetKnownUserAccountId(
+              user_email, std::string() /* gaia_id */)))
     ShowWhitelistCheckFailedError();
 }
 
 void GaiaScreenHandler::HandleWebviewLoadAborted(
     const std::string& error_reason_str) {
   // TODO(nkostylev): Switch to int code once webview supports that.
   // http://crbug.com/470483
   if (error_reason_str == "ERR_ABORTED") {
     LOG(WARNING) << "Ignoring Gaia webview error: " << error_reason_str;
     return;
@@ skipping 457 matching lines @@
 bool GaiaScreenHandler::IsRestrictiveProxy() const {
   return !disable_restrictive_proxy_check_for_test_ &&
          !IsOnline(captive_portal_status_);
 }
 
 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
   disable_restrictive_proxy_check_for_test_ = true;
 }
 
 }  // namespace chromeos