Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

trunk/src/chrome/browser/chromeos/login/user.cc

 // Copyright (c) 2012 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/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
 
 namespace {
 
 // Returns account name portion of an email.
 std::string GetUserName(const std::string& email) {
   std::string::size_type i = email.find('@');
@@ skipping 138 matching lines @@
   username = other.username;
   password = other.password;
   key_label = other.key_label;
   need_password_hashing = other.need_password_hashing;
   auth_code = other.auth_code;
   username_hash = other.username_hash;
   using_oauth = other.using_oauth;
   auth_flow = other.auth_flow;
 }
 
-std::string User::GetEmail() const {
-  return display_email();
-}
-
 base::string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ?
       base::UTF8ToUTF16(GetAccountName(true)) :
       display_name_;
 }
 
-base::string16 User::GetGivenName() const {
-  return given_name_;
-}
-
-const gfx::ImageSkia& User::GetImage() const {
-  return user_image_.image();
-}
-
-std::string User::GetUserID() const {
-  return gaia::CanonicalizeEmail(gaia::SanitizeEmail(
-      email()));
-}
-
 std::string User::GetAccountName(bool use_display_email) const {
   if (use_display_email && !display_email_.empty())
     return GetUserName(display_email_);
   else
     return GetUserName(email_);
 }
 
 bool User::HasDefaultImage() const {
   return image_index_ >= 0 && image_index_ < kDefaultImagesCount;
 }
@@ skipping 167 matching lines @@
     case USER_TYPE_LOCALLY_MANAGED:
     case USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace chromeos