ash: Merge LoginStatus update code path

ash/common/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/common/session/session_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 213 matching lines @@
       {SessionState::LOGGED_IN_NOT_ACTIVE, LoginStatus::NOT_LOGGED_IN},
       {SessionState::LOCKED, LoginStatus::LOCKED},
       // TODO: Add LOGIN_SECONDARY if we added a status for it.
   };
 
   mojom::SessionInfo info;
   FillDefaultSessionInfo(&info);
   for (const auto& test_case : kTestCases) {
     info.state = test_case.state;
     SetSessionInfo(info);
-    EXPECT_EQ(test_case.expected_status, controller()->GetLoginStatus())
+    EXPECT_EQ(test_case.expected_status, controller()->login_status())
         << "Test case state=" << static_cast<int>(test_case.state);
   }
 }
 
 // Tests that LoginStatus is computed correctly for active sessions.
 TEST_F(SessionControllerTest, GetLoginStateForActiveSession) {
   // Simulate an active user session.
   mojom::SessionInfo info;
   FillDefaultSessionInfo(&info);
   info.state = session_manager::SessionState::ACTIVE;
@@ skipping 15 matching lines @@
 
   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";
     controller()->UpdateUserSession(std::move(session));
 
-    EXPECT_EQ(test_case.expected_status, controller()->GetLoginStatus())
+    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());
 
   UpdateSession(1u, "user1@test.com");
   EXPECT_TRUE(controller()->IsActiveUserSessionStarted());
@@ skipping 26 matching lines @@
   EXPECT_EQ("user2@test.com", observer()->active_account_id().GetUserEmail());
 
   order = {1u, 2u};
   controller()->SetUserSessionOrder(order);
   EXPECT_EQ("user1@test.com,user2@test.com,", GetUserSessionEmails());
   EXPECT_EQ("user1@test.com", observer()->active_account_id().GetUserEmail());
 }
 
 }  // namespace
 }  // namespace ash