Move UserInfo to user_manager.

chrome/browser/ui/ash/session_state_delegate_views.cc

Index: chrome/browser/ui/ash/session_state_delegate_views.cc
diff --git a/chrome/browser/ui/ash/session_state_delegate_views.cc b/chrome/browser/ui/ash/session_state_delegate_views.cc
index 675a9bf1538fd66bba3d5c8d597f782e898028bb..96223195aa432bd1e9e53281a2251c7ab4b21740 100644
--- a/chrome/browser/ui/ash/session_state_delegate_views.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_views.cc
@@ -4,51 +4,12 @@
 
 #include "chrome/browser/ui/ash/session_state_delegate_views.h"
 
-#include "ash/session/user_info.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/user_manager/empty_user_info.h"
 #include "ui/gfx/image/image_skia.h"
 
-namespace {
-
-class EmptyUserInfo : public ash::UserInfo {
- public:
-  EmptyUserInfo() {}
-  virtual ~EmptyUserInfo() {}
-
-  // ash::UserInfo:
-  virtual base::string16 GetDisplayName() const OVERRIDE {
-    NOTIMPLEMENTED();
-    return base::UTF8ToUTF16(std::string());
-  }
-  virtual base::string16 GetGivenName() const OVERRIDE {
-    NOTIMPLEMENTED();
-    return base::UTF8ToUTF16(std::string());
-  }
-  virtual std::string GetEmail() const OVERRIDE {
-    NOTIMPLEMENTED();
-    return std::string();
-  }
-  virtual std::string GetUserID() const OVERRIDE {
-    NOTIMPLEMENTED();
-    return std::string();
-  }
-
-  virtual const gfx::ImageSkia& GetImage() const OVERRIDE {
-    NOTIMPLEMENTED();
-    // To make the compiler happy.
-    return null_image_;
-  }
-
- private:
-  const gfx::ImageSkia null_image_;
-
-  DISALLOW_COPY_AND_ASSIGN(EmptyUserInfo);
-};
-
-}  // namespace
-
 SessionStateDelegate::SessionStateDelegate() {
 }
 
@@ -106,14 +67,15 @@ ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState()
   return SESSION_STATE_ACTIVE;
 }
 
-const ash::UserInfo* SessionStateDelegate::GetUserInfo(
+const user_manager::UserInfo* SessionStateDelegate::GetUserInfo(
     ash::MultiProfileIndex index) const {
   return GetUserInfo(static_cast<content::BrowserContext*>(NULL));
 }
 
-const ash::UserInfo* SessionStateDelegate::GetUserInfo(
+const user_manager::UserInfo* SessionStateDelegate::GetUserInfo(
     content::BrowserContext* context) const {
-  static const ash::UserInfo* kUserInfo = new EmptyUserInfo();
+  static const user_manager::UserInfo* kUserInfo =
+      new user_manager::EmptyUserInfo();
   return kUserInfo;
 }