Move UserInfo to user_manager.

ash/test/test_session_state_delegate.cc

 // Copyright (c) 2013 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 "ash/test/test_session_state_delegate.h"
 
 #include <algorithm>
 #include <string>
 
-#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "ash/system/user/login_status.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/user_manager/user_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
 // The the "canonicalized" user ID from a given |email| address.
 std::string GetUserIDFromEmail(const std::string& email) {
   std::string user_id = email;
   std::transform(user_id.begin(), user_id.end(), user_id.begin(), ::tolower);
   return user_id;
 }
 
 }  // namespace
 
-class MockUserInfo : public UserInfo {
+class MockUserInfo : public user_manager::UserInfo {
  public:
   explicit MockUserInfo(const std::string& id) : email_(id) {}
   virtual ~MockUserInfo() {}
 
   void SetUserImage(const gfx::ImageSkia& user_image) {
     user_image_ = user_image;
   }
 
   virtual base::string16 GetDisplayName() const OVERRIDE {
     return base::UTF8ToUTF16("Über tray Über tray Über tray Über tray");
@@ skipping 39 matching lines @@
 }
 
 TestSessionStateDelegate::~TestSessionStateDelegate() {
   STLDeleteElements(&user_list_);
 }
 
 void TestSessionStateDelegate::AddUser(const std::string user_id) {
   user_list_.push_back(new MockUserInfo(user_id));
 }
 
-const UserInfo* TestSessionStateDelegate::GetActiveUserInfo() const {
+const user_manager::UserInfo* TestSessionStateDelegate::GetActiveUserInfo()
+    const {
   return user_list_[active_user_index_];
 }
 
 content::BrowserContext*
 TestSessionStateDelegate::GetBrowserContextByIndex(
     MultiProfileIndex index) {
   return NULL;
 }
 
 content::BrowserContext*
@@ skipping 82 matching lines @@
 void TestSessionStateDelegate::SetUserAddingScreenRunning(
     bool user_adding_screen_running) {
   user_adding_screen_running_ = user_adding_screen_running;
 }
 
 void TestSessionStateDelegate::SetUserImage(
     const gfx::ImageSkia& user_image) {
   user_list_[active_user_index_]->SetUserImage(user_image);
 }
 
-const UserInfo* TestSessionStateDelegate::GetUserInfo(
+const user_manager::UserInfo* TestSessionStateDelegate::GetUserInfo(
     MultiProfileIndex index) const {
   int max = static_cast<int>(user_list_.size());
   return user_list_[index < max ? index : max - 1];
 }
 
-const UserInfo* TestSessionStateDelegate::GetUserInfo(
+const user_manager::UserInfo* TestSessionStateDelegate::GetUserInfo(
     content::BrowserContext* context) const {
   return user_list_[active_user_index_];
 }
 
 bool TestSessionStateDelegate::ShouldShowAvatar(aura::Window* window) const {
   return !GetActiveUserInfo()->GetImage().isNull();
 }
 
 void TestSessionStateDelegate::SwitchActiveUser(const std::string& user_id) {
   // Make sure this is a user id and not an email address.
@@ skipping 17 matching lines @@
 void TestSessionStateDelegate::AddSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 void TestSessionStateDelegate::RemoveSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 }  // namespace test
 }  // namespace ash