Move UserInfo to user_manager.

ash/system/user/accounts_detailed_view.cc

 // Copyright 2014 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/system/user/accounts_detailed_view.h"
 
 #include <vector>
 
 #include "ash/multi_profile_uma.h"
-#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "ash/system/tray/fixed_sized_scroll_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_header_button.h"
 #include "ash/system/user/config.h"
 #include "ash/system/user/tray_user.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/user_manager/user_info.h"
 #include "grit/ash_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace ash {
 namespace tray {
 
@@ skipping 82 matching lines @@
   scroll_content()->AddChildView(account_list_title);
   account_list_ = new views::View();
   UpdateAccountList();
   scroll_content()->AddChildView(account_list_);
 }
 
 void AccountsDetailedView::AddAddAccountButton() {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   HoverHighlightView* add_account_button = new HoverHighlightView(this);
-  const UserInfo* user_info = session_state_delegate->GetUserInfo(0);
+  const user_manager::UserInfo* user_info =
+      session_state_delegate->GetUserInfo(0);
   base::string16 user_name = user_info->GetGivenName();
   if (user_name.empty())
     user_name = user_info->GetDisplayName();
   if (user_name.empty())
     user_name = base::ASCIIToUTF16(user_info->GetEmail());
   add_account_button->AddLabel(
       l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_ADD_ACCOUNT_LABEL,
                                  user_name),
       gfx::ALIGN_CENTER,
       gfx::Font::NORMAL);
@@ skipping 91 matching lines @@
       views::Button::STATE_HOVERED,
       rb.GetImageNamed(IDR_AURA_UBER_TRAY_REMOVE_ACCOUNT_HOVER).ToImageSkia());
   delete_button->SetImage(
       views::Button::STATE_PRESSED,
       rb.GetImageNamed(IDR_AURA_UBER_TRAY_REMOVE_ACCOUNT_HOVER).ToImageSkia());
   return delete_button;
 }
 
 }  // namespace tray
 }  // namespace ash