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

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

Index: trunk/src/chrome/browser/chromeos/login/user.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/user.cc	(revision 267249)
+++ trunk/src/chrome/browser/chromeos/login/user.cc	(working copy)
@@ -10,7 +10,6 @@
 #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"
 
@@ -169,10 +168,6 @@
   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() ?
@@ -180,19 +175,6 @@
       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_);