Clean up SessionStateDelegate in chrome

chrome/browser/ui/ash/session_controller_client.cc

Index: chrome/browser/ui/ash/session_controller_client.cc
diff --git a/chrome/browser/ui/ash/session_controller_client.cc b/chrome/browser/ui/ash/session_controller_client.cc
index 372cf906f3ca0634b9c86179b8543580e83758f2..315427c8ee1262b52f99dc4288f9554a89106ccb 100644
--- a/chrome/browser/ui/ash/session_controller_client.cc
+++ b/chrome/browser/ui/ash/session_controller_client.cc
@@ -33,9 +33,6 @@ using user_manager::UserList;
 
 namespace {
 
-// Limits the number of logged in users to 10 due to memory constraints.
-constexpr uint32_t kMaxUsers = 10;
-
 SessionControllerClient* g_instance = nullptr;
 
 uint32_t GetSessionId(const User* user) {
@@ -170,7 +167,8 @@ ash::AddUserSessionPolicy SessionControllerClient::GetAddUserSessionPolicy() {
     return ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER;
   }
 
-  if (UserManager::Get()->GetLoggedInUsers().size() >= kMaxUsers)
+  if (UserManager::Get()->GetLoggedInUsers().size() >=
+      session_manager::SessionManager::Get()->GetMaximumNumberOfUserSessions())
     return ash::AddUserSessionPolicy::ERROR_MAXIMUM_USERS_REACHED;
 
   return ash::AddUserSessionPolicy::ALLOWED;
@@ -253,12 +251,15 @@ void SessionControllerClient::ConnectToSessionControllerAndSetClient() {
 }
 
 void SessionControllerClient::SendSessionInfoIfChanged() {
+  session_manager::SessionManager* const session_manager =

[James Cook, 2017/01/06 23:52:43]

optional: I'm OK with "using session_manager::SessionManager" if it makes line
wrapping better (here and in other files)

[xiyuan, 2017/01/07 00:07:32]

Done.

+      session_manager::SessionManager::Get();
+
   ash::mojom::SessionInfoPtr info = ash::mojom::SessionInfo::New();
-  info->max_users = kMaxUsers;
+  info->max_users = session_manager->GetMaximumNumberOfUserSessions();
   info->can_lock_screen = CanLockScreen();
   info->should_lock_screen_automatically = ShouldLockScreenAutomatically();
   info->add_user_session_policy = GetAddUserSessionPolicy();
-  info->state = session_manager::SessionManager::Get()->session_state();
+  info->state = session_manager->session_state();
 
   if (info != last_sent_session_info_) {
     last_sent_session_info_ = info->Clone();