CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

BUG=None
R=nkostylev@chromium.org
TBR=sky@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267158

Review URL: https://codereview.chromium.org/253063002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267337 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 37 insertions, 24 deletions

diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc
index fe5bb68..58956b5 100644
--- a/ash/system/user/accounts_detailed_view.cc
+++ b/ash/system/user/accounts_detailed_view.cc
@@ -7,6 +7,7 @@
 #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"
@@ -43,8 +44,10 @@ AccountsDetailedView::AccountsDetailedView(TrayUser* owner,
       account_list_(NULL),
       add_account_button_(NULL),
       add_user_button_(NULL) {
-  std::string user_id =
-      Shell::GetInstance()->session_state_delegate()->GetUserID(0);
+  std::string user_id = Shell::GetInstance()
+                            ->session_state_delegate()
+                            ->GetUserInfo(0)
+                            ->GetUserID();
   delegate_ =
       Shell::GetInstance()->system_tray_delegate()->GetUserAccountsDelegate(
           user_id);
@@ -117,11 +120,12 @@ void AccountsDetailedView::AddAddAccountButton() {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   HoverHighlightView* add_account_button = new HoverHighlightView(this);
-  base::string16 user_name = session_state_delegate->GetUserGivenName(0);
+  const UserInfo* user_info = session_state_delegate->GetUserInfo(0);
+  base::string16 user_name = user_info->GetGivenName();
   if (user_name.empty())
-    user_name = session_state_delegate->GetUserDisplayName(0);
+    user_name = user_info->GetDisplayName();
   if (user_name.empty())
-    user_name = base::ASCIIToUTF16(session_state_delegate->GetUserEmail(0));
+    user_name = base::ASCIIToUTF16(user_info->GetEmail());
   add_account_button->AddLabel(
       l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_ADD_ACCOUNT_LABEL,
                                  user_name),
diff --git a/ash/system/user/config.cc b/ash/system/user/config.cc
index d704393..1ea6d32 100644
--- a/ash/system/user/config.cc
+++ b/ash/system/user/config.cc
@@ -4,7 +4,7 @@
 
 #include "ash/system/user/config.h"
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 
diff --git a/ash/system/user/login_status.cc b/ash/system/user/login_status.cc
index 3172cd7..97c05c15 100644
--- a/ash/system/user/login_status.cc
+++ b/ash/system/user/login_status.cc
@@ -4,7 +4,7 @@
 
 #include "ash/system/user/login_status.h"
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index 2a8dfe1..cb5676c 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -6,7 +6,8 @@
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/session/user_info.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
@@ -263,7 +264,7 @@ void TrayUser::UpdateAvatarImage(user::LoginStatus status) {
 
   content::BrowserContext* context = session_state_delegate->
       GetBrowserContextByIndex(GetTrayIndex());
-  avatar_->SetImage(session_state_delegate->GetUserImage(context),
+  avatar_->SetImage(session_state_delegate->GetUserInfo(context)->GetImage(),
                     gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
 
   // Unit tests might come here with no images for some users.
diff --git a/ash/system/user/tray_user.h b/ash/system/user/tray_user.h
index 0b19d47..1e0aa281 100644
--- a/ash/system/user/tray_user.h
+++ b/ash/system/user/tray_user.h
@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_USER_TRAY_USER_H_
 
 #include "ash/ash_export.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/user/user_observer.h"
 #include "base/compiler_specific.h"
diff --git a/ash/system/user/tray_user_separator.cc b/ash/system/user/tray_user_separator.cc
index dd60f6b..7058d2f 100644
--- a/ash/system/user/tray_user_separator.cc
+++ b/ash/system/user/tray_user_separator.cc
@@ -4,7 +4,7 @@
 
 #include "ash/system/user/tray_user_separator.h"
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ui/views/view.h"
 
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc
index b0d77c4..3205666 100644
--- a/ash/system/user/tray_user_unittest.cc
+++ b/ash/system/user/tray_user_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
+#include "ash/session/user_info.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ -238,10 +239,12 @@ TEST_F(TrayUserTest, MutiUserModeButtonClicks) {
 
   // Switch to a new user - which has a capitalized name.
   ClickUserItem(&generator, 1);
-  EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserID(1));
+  const UserInfo* active_user = delegate()->GetActiveUserInfo();
+  const UserInfo* second_user = delegate()->GetUserInfo(1);
+  EXPECT_EQ(active_user->GetUserID(), second_user->GetUserID());
   // Since the name is capitalized, the email should be different then the
   // user_id.
-  EXPECT_NE(delegate()->get_activated_user(), delegate()->GetUserEmail(1));
+  EXPECT_NE(active_user->GetUserID(), second_user->GetEmail());
   tray()->CloseSystemBubble();
 }
 
diff --git a/ash/system/user/user_card_view.cc b/ash/system/user/user_card_view.cc
index 6d5413e..af568ae 100644
--- a/ash/system/user/user_card_view.cc
+++ b/ash/system/user/user_card_view.cc
@@ -7,7 +7,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
@@ -89,8 +90,10 @@ PublicAccountUserDetails::PublicAccountUserDetails(int max_width)
   // Retrieve the user's display name and wrap it with markers.
   // Note that since this is a public account it always has to be the primary
   // user.
-  base::string16 display_name =
-      Shell::GetInstance()->session_state_delegate()->GetUserDisplayName(0);
+  base::string16 display_name = Shell::GetInstance()
+                                    ->session_state_delegate()
+                                    ->GetUserInfo(0)
+                                    ->GetDisplayName();
   base::RemoveChars(display_name, kDisplayNameMark, &display_name);
   display_name = kDisplayNameMark[0] + display_name + kDisplayNameMark[0];
   // Retrieve the domain managing the device and wrap it with markers.
@@ -305,10 +308,10 @@ void UserCardView::AddUserContent(user::LoginStatus login_status,
     base::string16 user_name_string =
         login_status == user::LOGGED_IN_GUEST
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL)
-            : delegate->GetUserDisplayName(multiprofile_index);
+            : delegate->GetUserInfo(multiprofile_index)->GetDisplayName();
     if (user_name_string.empty() && IsMultiAccountSupportedAndUserActive())
-      user_name_string =
-          base::ASCIIToUTF16(delegate->GetUserEmail(multiprofile_index));
+      user_name_string = base::ASCIIToUTF16(
+          delegate->GetUserInfo(multiprofile_index)->GetEmail());
     if (!user_name_string.empty()) {
       username = new views::Label(user_name_string);
       username->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -322,7 +325,8 @@ void UserCardView::AddUserContent(user::LoginStatus login_status,
         login_status == user::LOGGED_IN_LOCALLY_MANAGED
             ? l10n_util::GetStringUTF16(
                   IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL)
-            : base::UTF8ToUTF16(delegate->GetUserEmail(multiprofile_index));
+            : base::UTF8ToUTF16(
+                  delegate->GetUserInfo(multiprofile_index)->GetEmail());
     if (!user_email_string.empty()) {
       additional = new views::Label(user_email_string);
       additional->SetFontList(
@@ -372,7 +376,7 @@ views::View* UserCardView::CreateIcon(user::LoginStatus login_status,
         Shell::GetInstance()->session_state_delegate();
     content::BrowserContext* context =
         delegate->GetBrowserContextByIndex(multiprofile_index);
-    icon->SetImage(delegate->GetUserImage(context),
+    icon->SetImage(delegate->GetUserInfo(context)->GetImage(),
                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
   }
   return icon;
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
index 4743163..f5eb6833 100644
--- a/ash/system/user/user_view.cc
+++ b/ash/system/user/user_view.cc
@@ -8,7 +8,8 @@
 
 #include "ash/multi_profile_uma.h"
 #include "ash/popup_message.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
@@ -76,7 +77,7 @@ void SwitchUser(ash::MultiProfileIndex user_index) {
       ash::Shell::GetInstance()->session_state_delegate();
   ash::MultiProfileUMA::RecordSwitchActiveUser(
       ash::MultiProfileUMA::SWITCH_ACTIVE_USER_BY_TRAY);
-  delegate->SwitchActiveUser(delegate->GetUserID(user_index));
+  delegate->SwitchActiveUser(delegate->GetUserInfo(user_index)->GetUserID());
 }
 
 class LogoutButton : public TrayPopupLabelButton {
diff --git a/ash/system/user/user_view.h b/ash/system/user/user_view.h
index e6657c6..b51b4c7 100644
--- a/ash/system/user/user_view.h
+++ b/ash/system/user/user_view.h
@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_USER_USER_VIEW_H_
 #define ASH_SYSTEM_USER_USER_VIEW_H_
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/user/tray_user.h"