Revert of This CL replaces e-mail with AccountId on user selection screen.

components/user_manager/user.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 "components/user_manager/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 105 matching lines @@
 }
 
 base::string16 User::GetGivenName() const {
   return given_name_;
 }
 
 const gfx::ImageSkia& User::GetImage() const {
   return user_image_.image();
 }
 
-const AccountId& User::GetAccountId() const {
-  return account_id_;
+AccountId User::GetAccountId() const {
+  return AccountId::FromUserEmail(
+      gaia::CanonicalizeEmail(gaia::SanitizeEmail(email())));
 }
 
 void User::SetIsChild(bool is_child) {
   VLOG(1) << "Ignoring SetIsChild call with param " << is_child;
   if (is_child) {
     NOTREACHED() << "Calling SetIsChild(true) for base User class."
                  << "Base class cannot be set as child";
   }
 }
 
@@ skipping 174 matching lines @@
     case user_manager::USER_TYPE_SUPERVISED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace user_manager