cros: Pull user info from session_controller_client.mojom into separate mojom.

ash/test/test_session_controller_client.cc

 // Copyright 2017 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_controller_client.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/login_status.h"
@@ skipping 83 matching lines @@
   // Updates session state after adding user sessions.
   SetSessionState(session_manager::SessionState::ACTIVE);
 }
 
 void TestSessionControllerClient::AddUserSession(
     const std::string& display_email,
     user_manager::UserType user_type,
     bool enable_settings) {
   mojom::UserSessionPtr session = mojom::UserSession::New();
   session->session_id = ++fake_session_id_;
-  session->type = user_type;
-  session->account_id =
+  session->user_info = mojom::UserInfo::New();
+  session->user_info->type = user_type;
+  session->user_info->account_id =
       AccountId::FromUserEmail(GetUserIdFromEmail(display_email));
-  session->display_name = "Über tray Über tray Über tray Über tray";
-  session->display_email = display_email;
+  session->user_info->display_name = "Über tray Über tray Über tray Über tray";
+  session->user_info->display_email = display_email;
   session->should_enable_settings = enable_settings;
   session->should_show_notification_tray = true;
   controller_->UpdateUserSession(std::move(session));
 }
 
 void TestSessionControllerClient::UnlockScreen() {
   SetSessionState(session_manager::SessionState::ACTIVE);
 }
 
 void TestSessionControllerClient::RequestLockScreen() {
   SetSessionState(session_manager::SessionState::LOCKED);
 }
 
 void TestSessionControllerClient::SwitchActiveUser(
     const AccountId& account_id) {
   std::vector<uint32_t> session_order;
   session_order.reserve(controller_->GetUserSessions().size());
 
   for (const auto& user_session : controller_->GetUserSessions()) {
-    if (user_session->account_id == account_id) {
+    if (user_session->user_info->account_id == account_id) {
       session_order.insert(session_order.begin(), user_session->session_id);
     } else {
       session_order.push_back(user_session->session_id);
     }
   }
 
   controller_->SetUserSessionOrder(session_order);
 }
 
 void TestSessionControllerClient::CycleActiveUser(
@@ skipping 27 matching lines @@
   // Maps session id to AccountId and call SwitchActiveUser.
   auto it = std::find_if(sessions.begin(), sessions.end(),
                          [session_id](const mojom::UserSessionPtr& session) {
                            return session && session->session_id == session_id;
                          });
   if (it == sessions.end()) {
     NOTREACHED();
     return;
   }
 
-  SwitchActiveUser((*it)->account_id);
+  SwitchActiveUser((*it)->user_info->account_id);
 }
 
 }  // namespace test
 }  // namespace ash