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

ash/session/session_controller_unittest.cc

 // Copyright 2016 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/session/session_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 73 matching lines @@
 
   void SetSessionInfo(const mojom::SessionInfo& info) {
     mojom::SessionInfoPtr info_ptr = mojom::SessionInfo::New();
     *info_ptr = info;
     controller_->SetSessionInfo(std::move(info_ptr));
   }
 
   void UpdateSession(uint32_t session_id, const std::string& email) {
     mojom::UserSessionPtr session = mojom::UserSession::New();
     session->session_id = session_id;
-    session->type = user_manager::USER_TYPE_REGULAR;
-    session->account_id = AccountId::FromUserEmail(email);
-    session->display_name = email;
-    session->display_email = email;
+    session->user_info = mojom::UserInfo::New();
+    session->user_info->type = user_manager::USER_TYPE_REGULAR;
+    session->user_info->account_id = AccountId::FromUserEmail(email);
+    session->user_info->display_name = email;
+    session->user_info->display_email = email;
 
     controller_->UpdateUserSession(std::move(session));
   }
 
   std::string GetUserSessionEmails() const {
     std::string emails;
     for (const auto& session : controller_->GetUserSessions()) {
-      emails += session->display_email + ",";
+      emails += session->user_info->display_email + ",";
     }
     return emails;
   }
 
   SessionController* controller() { return controller_.get(); }
   const TestSessionObserver* observer() const { return &observer_; }
 
  private:
   std::unique_ptr<SessionController> controller_;
   TestSessionObserver observer_;
@@ skipping 133 matching lines @@
       {user_manager::USER_TYPE_SUPERVISED, LoginStatus::SUPERVISED},
       {user_manager::USER_TYPE_KIOSK_APP, LoginStatus::KIOSK_APP},
       {user_manager::USER_TYPE_CHILD, LoginStatus::SUPERVISED},
       {user_manager::USER_TYPE_ARC_KIOSK_APP, LoginStatus::ARC_KIOSK_APP},
       // TODO: Add USER_TYPE_ACTIVE_DIRECTORY if we add a status for it.
   };
 
   for (const auto& test_case : kTestCases) {
     mojom::UserSessionPtr session = mojom::UserSession::New();
     session->session_id = 1u;
-    session->type = test_case.user_type;
-    session->account_id = AccountId::FromUserEmail("user1@test.com");
-    session->display_name = "User 1";
-    session->display_email = "user1@test.com";
+    session->user_info = mojom::UserInfo::New();
+    session->user_info->type = test_case.user_type;
+    session->user_info->account_id = AccountId::FromUserEmail("user1@test.com");
+    session->user_info->display_name = "User 1";
+    session->user_info->display_email = "user1@test.com";
     controller()->UpdateUserSession(std::move(session));
 
     EXPECT_EQ(test_case.expected_status, controller()->login_status())
         << "Test case user_type=" << static_cast<int>(test_case.user_type);
   }
 }
 
 // Tests that user sessions can be set and updated.
 TEST_F(SessionControllerTest, UserSessions) {
   EXPECT_FALSE(controller()->IsActiveUserSessionStarted());
@@ skipping 69 matching lines @@
 
     EXPECT_EQ(test_case.expected_is_user_session_blocked,
               controller()->IsUserSessionBlocked())
         << "Test case state=" << static_cast<int>(test_case.state);
   }
 }
 
 TEST_F(SessionControllerTest, IsUserSupervised) {
   mojom::UserSessionPtr session = mojom::UserSession::New();
   session->session_id = 1u;
-  session->type = user_manager::USER_TYPE_SUPERVISED;
+  session->user_info = mojom::UserInfo::New();
+  session->user_info->type = user_manager::USER_TYPE_SUPERVISED;
   controller()->UpdateUserSession(std::move(session));
 
   EXPECT_TRUE(controller()->IsUserSupervised());
 }
 
 TEST_F(SessionControllerTest, IsUserChild) {
   mojom::UserSessionPtr session = mojom::UserSession::New();
   session->session_id = 1u;
-  session->type = user_manager::USER_TYPE_CHILD;
+  session->user_info = mojom::UserInfo::New();
+  session->user_info->type = user_manager::USER_TYPE_CHILD;
   controller()->UpdateUserSession(std::move(session));
 
   EXPECT_TRUE(controller()->IsUserChild());
 
   // Child accounts are supervised.
   EXPECT_TRUE(controller()->IsUserSupervised());
 }
 
 }  // namespace
 }  // namespace ash