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..0914ca2e0358517a146b180ccca4b6da429b4521 100644
--- a/chrome/browser/ui/ash/session_state_delegate_views.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_views.cc
@@ -4,20 +4,20 @@
 
 #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/user_info.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
-class EmptyUserInfo : public ash::UserInfo {
+class EmptyUserInfo : public user_manager::UserInfo {
  public:
   EmptyUserInfo() {}
   virtual ~EmptyUserInfo() {}
 
-  // ash::UserInfo:
+  // user_manager::UserInfo:
   virtual base::string16 GetDisplayName() const OVERRIDE {
     NOTIMPLEMENTED();
     return base::UTF8ToUTF16(std::string());
@@ -106,14 +106,14 @@ 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 EmptyUserInfo();
   return kUserInfo;
 }